From 17119087008aacf2f2d88168dbbb2a129451c776 Mon Sep 17 00:00:00 2001 From: Pengcheng Chen Date: Tue, 21 Oct 2025 06:34:28 +0000 Subject: [PATCH] vpp: fix t6w video reg_dump crash [1/1] PD#SWPL-235885 Problem: t6w can not visit VD1_SCO_FIFO_CTRL Solution: after t6x visit video reg Verify: t6w Change-Id: I62750694375def2c7637c0611642d4e512e0c3a8 Signed-off-by: Pengcheng Chen (cherry picked from commit e50b923a1c0a3f3fa9bd29bb8adaa99572761e40) --- drivers/media/video_sink/video_common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/video_sink/video_common.c b/drivers/media/video_sink/video_common.c index f7e40fc9c..e28d1967b 100644 --- a/drivers/media/video_sink/video_common.c +++ b/drivers/media/video_sink/video_common.c @@ -1722,7 +1722,8 @@ static void dump_vpp_path_size_reg(void) reg_val = READ_VCBUS_REG(reg_addr); pr_info("postlend_vd1_v_start_end[0x%x] = 0x%X\n", reg_addr, reg_val); - if (cur_dev->display_module == T6W_DISPLAY_MODULE) { + if (cur_dev->display_module == T6W_DISPLAY_MODULE && + video_is_after_meson_t6x_cpu()) { reg_addr = p_vpp_path_size_reg->vd1_sco_fifo_ctrl; reg_val = READ_VCBUS_REG(reg_addr); pr_info("vd1_sco_fifo_ctrl[0x%x] = 0x%X\n", @@ -1757,7 +1758,8 @@ static void dump_vpp_path_size_reg(void) reg_val = READ_VCBUS_REG(reg_addr); pr_info("blend_vd2_v_start_end[0x%x] = 0x%X\n", reg_addr, reg_val); - if (cur_dev->display_module == T6W_DISPLAY_MODULE) { + if (cur_dev->display_module == T6W_DISPLAY_MODULE && + video_is_after_meson_t6x_cpu()) { reg_addr = p_vpp_path_size_reg->vd2_sco_fifo_ctrl; reg_val = READ_VCBUS_REG(reg_addr); pr_info("vd2_sco_fifo_ctrl[0x%x] = 0x%X\n",