From 2b9c1c05bad2ac6ff930de8bf6f1c7b8fc21a9d8 Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Fri, 27 Sep 2019 02:01:46 +0800 Subject: [PATCH] vpp: use the correct sr0 max width [1/1] PD#SWPL-14306 Problem: When sr0 v scaler is enabled or not, the sr0 max width is incorrectly. Solution: Using the correct sr0 max width. Verify: Verified by u212 Change-Id: Id5e0b66f0878676536be0e0970fe8f26419b978c Signed-off-by: Brian Zhu --- drivers/amlogic/media/video_sink/vpp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c index c088c18..0d8dc16 100644 --- a/drivers/amlogic/media/video_sink/vpp.c +++ b/drivers/amlogic/media/video_sink/vpp.c @@ -1758,10 +1758,10 @@ int vpp_set_super_scaler_regs( sr_reg_offt = sr->sr_reg_offt; sr_reg_offt2 = sr->sr_reg_offt2; /* just work around for g12a not to disable sr core2 bit2 */ - if (is_meson_g12a_cpu() && (reg_srscl0_vert_ratio == 0)) - sr_core0_max_width = sr->core0_v_enable_width_max; - else + if (reg_srscl0_vert_ratio == 0) sr_core0_max_width = sr->core0_v_disable_width_max; + else + sr_core0_max_width = sr->core0_v_enable_width_max; /* top config */ tmp_data = VSYNC_RD_MPEG_REG(VPP_SRSHARP0_CTRL); -- 2.7.4