summaryrefslogtreecommitdiff
authorBencheng Jing <bencheng.jing@amlogic.com>2019-10-16 11:06:03 (GMT)
committer Jianxin Pan <jianxin.pan@amlogic.com>2019-10-21 09:28:14 (GMT)
commitc463ec252d915f6b67584556c76fbdb59f1740ca (patch)
tree6e9533f83291bc268d87d457326e820b8ff07c70
parent10502f65af0f55822f8bc975a1a5dc6c95d5880e (diff)
downloadcommon-c463ec252d915f6b67584556c76fbdb59f1740ca.zip
common-c463ec252d915f6b67584556c76fbdb59f1740ca.tar.gz
common-c463ec252d915f6b67584556c76fbdb59f1740ca.tar.bz2
vpp: dynamic adjust scaler path according to supsc0 h&v ratio [2/2]
PD#SWPL-12202 Problem: scaler path need adjust according to supsc0 h&v ratio Solution: add dynamic adjust scaler path Verify: g12a&sm1 Change-Id: If00b4c321e24910ff7abd166d9a828dc424ab0d0 Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Diffstat
-rw-r--r--drivers/amlogic/media/video_sink/vpp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c
index 2338cdb..e61246f 100644
--- a/drivers/amlogic/media/video_sink/vpp.c
+++ b/drivers/amlogic/media/video_sink/vpp.c
@@ -2101,7 +2101,11 @@ static void vpp_set_super_scaler(
is_meson_g12a_cpu() ||
is_meson_g12b_cpu() ||
is_meson_sm1_cpu()) {
- next_frame_par->supscl_path = CORE0_BEFORE_PPS;
+ if (next_frame_par->supsc0_hori_ratio &&
+ next_frame_par->supsc0_vert_ratio)
+ next_frame_par->supscl_path = CORE0_BEFORE_PPS;
+ else
+ next_frame_par->supscl_path = CORE0_AFTER_PPS;
} else
next_frame_par->supscl_path = CORE0_PPS_CORE1;
} else