From: Pengcheng Chen Date: Tue, 10 Dec 2019 09:16:09 +0000 (+0800) Subject: vpp: fix vd1 afbc mif regs overwritten by vd2 [1/1] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1365f14d3fc26fb377fe24d315012ca27a1c47d3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git vpp: fix vd1 afbc mif regs overwritten by vd2 [1/1] PD#SWPL-18101 Problem: vd1 afbc mif regs overwritten by vd2 Solution: set vd2 afbc mif regs correctly Verify: Verify on ab301 Change-Id: I1b761134dd24413ae2af569b6d35b247de21ebcb Signed-off-by: Pengcheng Chen --- diff --git a/drivers/amlogic/media/video_sink/video_hw.c b/drivers/amlogic/media/video_sink/video_hw.c index 0a4c0e62f2d6..4c7a38ba49a8 100644 --- a/drivers/amlogic/media/video_sink/video_hw.c +++ b/drivers/amlogic/media/video_sink/video_hw.c @@ -1721,7 +1721,7 @@ static s32 vd2_afbc_setting_tl1(struct mif_pos_s *setting) setting->start_x_lines; VSYNC_WR_MPEG_REG( - AFBC_MIF_HOR_SCOPE + afbc_off, + VD2_AFBC_MIF_HOR_SCOPE + afbc_off, (mif_blk_bgn_h << 16) | mif_blk_end_h); @@ -1731,7 +1731,7 @@ static s32 vd2_afbc_setting_tl1(struct mif_pos_s *setting) /* do nothing*/ } else { VSYNC_WR_MPEG_REG( - AFBC_PIXEL_HOR_SCOPE + afbc_off, + VD2_AFBC_PIXEL_HOR_SCOPE + afbc_off, ((pix_bgn_h << 16) | pix_end_h)); }