From 9a6929c19323c22a89d12d74176417086f39f79c Mon Sep 17 00:00:00 2001 From: Dezhi Kong Date: Mon, 25 Jun 2018 16:20:58 +0800 Subject: [PATCH] vpp: adjust vpp skip line limit for bandwidth PD#167737: VPP: adjust vpp skip line limit for bandwidth Change-Id: I18c4325750a3c266936db849e52d938adf00adda Signed-off-by: Dezhi Kong --- drivers/amlogic/media/video_sink/video.c | 2 ++ drivers/amlogic/media/video_sink/vpp.c | 6 +++++- include/linux/amlogic/media/video_sink/vpp.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c index f03009c..329441050 100644 --- a/drivers/amlogic/media/video_sink/video.c +++ b/drivers/amlogic/media/video_sink/video.c @@ -7660,6 +7660,8 @@ static ssize_t video_state_show(struct class *cla, cur_frame_par->video_input_w); len += sprintf(buf + len, "video_input_h %u.\n", cur_frame_par->video_input_h); + len += sprintf(buf + len, "clk_in_pps %u.\n", + cur_frame_par->clk_in_pps); #ifdef TV_3D_FUNCTION_OPEN len += sprintf(buf + len, "vpp_2pic_mode %u.\n", cur_frame_par->vpp_2pic_mode); diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c index 42819b1..6c16982 100644 --- a/drivers/amlogic/media/video_sink/vpp.c +++ b/drivers/amlogic/media/video_sink/vpp.c @@ -657,6 +657,7 @@ vpp_process_speed_check(s32 width_in, clk_in_pps = get_vpu_clk(); } + next_frame_par->clk_in_pps = clk_in_pps; vpu_clk = get_vpu_clk(); /* the output is only up to 1080p */ if (vpu_clk <= 250000000) { @@ -2671,7 +2672,10 @@ void vpp_bypass_ratio_config(void) if (is_meson_gxbb_cpu() || is_meson_gxl_cpu() || is_meson_gxm_cpu()) bypass_ratio = 125; - else if (is_meson_txlx_cpu() || is_meson_txl_cpu()) + else if (is_meson_txlx_cpu()) + /*change from 247 to 210 for bandwidth @20180627*/ + bypass_ratio = 210; + else if (is_meson_txl_cpu()) bypass_ratio = 247;/*0x110 * (100/110)=0xf7*/ else bypass_ratio = 205; diff --git a/include/linux/amlogic/media/video_sink/vpp.h b/include/linux/amlogic/media/video_sink/vpp.h index e162ee4..08d8934 100644 --- a/include/linux/amlogic/media/video_sink/vpp.h +++ b/include/linux/amlogic/media/video_sink/vpp.h @@ -136,6 +136,7 @@ struct vpp_frame_par_s { u32 spsc1_h_in; u32 video_input_w; u32 video_input_h; + u32 clk_in_pps; bool nocomp; -- 2.7.4