vpp: sr software flow improvement [1/1]

PD#SWPL-13633

Problem:
sr input size need improvement

Solution:
improvement sr software flow

Verify:
verified by sm1

Change-Id: I10b9dd6d057fc8906ce312576623480aa14ae8a3
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>

diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c
index 9ee61ae396044d8ae3efd6a8de63b5d5b9b0b200..c088c183b64ede589759522445d5aedd6413bb17 100644 (file)
--- a/drivers/amlogic/media/video_sink/vpp.c
+++ b/drivers/amlogic/media/video_sink/vpp.c
@@ -389,9 +389,7 @@ module_param(force_filter_mode, int, 0664);
 #endif
 /*temp disable sr for power test*/
 bool super_scaler = true;
-static unsigned int sr_support;
-static u32 sr_reg_offt;
-static u32 sr_reg_offt2;       /*for tl1*/
+struct sr_info_s sr_info;
 static unsigned int super_debug;
 module_param(super_debug, uint, 0664);
 MODULE_PARM_DESC(super_debug, "super_debug");
@@ -1749,11 +1747,21 @@ int vpp_set_super_scaler_regs(
        int tmp_data = 0;
        int tmp_data2 = 0;
        unsigned int data_path_chose;
-       int sr_core0_max_width = SUPER_CORE0_WIDTH_MAX;
-
+       int sr_core0_max_width;
+       struct sr_info_s *sr;
+       u32 sr_reg_offt;
+       u32 sr_reg_offt2;
+       u32 sr_support;
+
+       sr = &sr_info;
+       sr_support = sr->sr_support;
+       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 = SUPER_CORE0_WIDTH_MAX << 1;
+               sr_core0_max_width = sr->core0_v_enable_width_max;
+       else
+               sr_core0_max_width = sr->core0_v_disable_width_max;
 
        /* top config */
        tmp_data = VSYNC_RD_MPEG_REG(VPP_SRSHARP0_CTRL);
@@ -1955,7 +1963,11 @@ static void vpp_set_super_scaler(
        u32 src_width = next_frame_par->video_input_w;
        u32 src_height = next_frame_par->video_input_h;
        u32 sr_path;
+       struct sr_info_s *sr;
+       u32 sr_support;
 
+       sr = &sr_info;
+       sr_support = sr->sr_support;
        /*for sr adjust*/
        vpp_super_scaler_support();
 
@@ -1975,11 +1987,11 @@ static void vpp_set_super_scaler(
        /* step1: judge core0&core1 vertical enable or disable*/
        if (ver_sc_multiple_num >= 2*SUPER_SCALER_V_FACTOR) {
                next_frame_par->supsc0_vert_ratio =
-                       ((src_width < SUPER_CORE0_WIDTH_MAX / 2) &&
+                       ((src_width < sr->core0_v_enable_width_max) &&
                        (sr_support & SUPER_CORE0_SUPPORT)) ? 1 : 0;
                next_frame_par->supsc1_vert_ratio =
-                       ((width_out < SUPER_CORE1_WIDTH_MAX) &&
-                       (src_width < SUPER_CORE1_WIDTH_MAX / 2) &&
+                       ((width_out < sr->core1_v_disable_width_max) &&
+                       (src_width < sr->core1_v_enable_width_max) &&
                        (sr_support & SUPER_CORE1_SUPPORT)) ? 1 : 0;
                if (next_frame_par->supsc0_vert_ratio &&
                        (ver_sc_multiple_num < 4 * SUPER_SCALER_V_FACTOR))
@@ -1997,19 +2009,19 @@ static void vpp_set_super_scaler(
        /* step2: judge core0&core1 horizontal enable or disable*/
        if ((hor_sc_multiple_num >= 2) &&
                (vpp_wide_mode != VIDEO_WIDEOPTION_NONLINEAR)) {
-               if ((src_width > SUPER_CORE0_WIDTH_MAX) ||
-                       ((src_width > SUPER_CORE0_WIDTH_MAX / 2) &&
-                       next_frame_par->supsc0_vert_ratio) ||
-                       (((src_width << 1) > SUPER_CORE1_WIDTH_MAX / 2) &&
-                       next_frame_par->supsc1_vert_ratio))
+               if ((src_width > sr->core0_v_disable_width_max) ||
+                   ((src_width > sr->core0_v_enable_width_max) &&
+                    next_frame_par->supsc0_vert_ratio) ||
+                   (((src_width << 1) > sr->core1_v_enable_width_max) &&
+                    next_frame_par->supsc1_vert_ratio))
                        next_frame_par->supsc0_hori_ratio = 0;
                else if (sr_support & SUPER_CORE0_SUPPORT)
                        next_frame_par->supsc0_hori_ratio = 1;
-               if (((width_out >> 1) > SUPER_CORE1_WIDTH_MAX) ||
-                       (((width_out >> 1) > SUPER_CORE1_WIDTH_MAX / 2) &&
-                       next_frame_par->supsc1_vert_ratio) ||
-                       (next_frame_par->supsc0_hori_ratio &&
-                       (hor_sc_multiple_num < 4)))
+               if (((width_out >> 1) > sr->core1_v_disable_width_max) ||
+                   (((width_out >> 1) > sr->core1_v_enable_width_max) &&
+                    next_frame_par->supsc1_vert_ratio) ||
+                   (next_frame_par->supsc0_hori_ratio &&
+                   (hor_sc_multiple_num < 4)))
                        next_frame_par->supsc1_hori_ratio = 0;
                else if (sr_support & SUPER_CORE1_SUPPORT)
                        next_frame_par->supsc1_hori_ratio = 1;
@@ -2030,14 +2042,14 @@ static void vpp_set_super_scaler(
        /*double check core1 input width for core1_vert_ratio!!!*/
        if (next_frame_par->supsc1_vert_ratio &&
                (width_out >> next_frame_par->supsc1_hori_ratio >
-               SUPER_CORE1_WIDTH_MAX/2)) {
+               sr->core1_v_enable_width_max)) {
                next_frame_par->supsc1_vert_ratio = 0;
                if (next_frame_par->supsc1_hori_ratio == 0)
                        next_frame_par->supsc1_enable = 0;
        }
        /* option add patch */
        if ((ver_sc_multiple_num <= super_scaler_v_ratio) &&
-               (src_height >= SUPER_CORE0_WIDTH_MAX / 2) &&
+               (src_height >= sr->core0_v_enable_width_max) &&
                (src_height <= 1088) &&
                (ver_sc_multiple_num > SUPER_SCALER_V_FACTOR) &&
                (vinfo->height >= 2000)) {
@@ -3338,42 +3350,58 @@ void vpp_disp_info_init(
 
 void vpp_super_scaler_support(void)
 {
+       struct sr_info_s *sr;
+
+       sr = &sr_info;
        if (is_meson_gxlx_cpu()) {
-               sr_support &= ~SUPER_CORE0_SUPPORT;
-               sr_support |= SUPER_CORE1_SUPPORT;
-       } else if (is_meson_txhd_cpu() ||
-               is_meson_g12a_cpu() ||
+               sr->sr_support &= ~SUPER_CORE0_SUPPORT;
+               sr->sr_support |= SUPER_CORE1_SUPPORT;
+               sr->core1_v_disable_width_max = 4096;
+               sr->core1_v_enable_width_max = 2048;
+       } else if (is_meson_txhd_cpu()) {
+               /* 2k pannal */
+               sr->sr_support |= SUPER_CORE0_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE1_SUPPORT;
+               sr->core0_v_disable_width_max = 2048;
+               sr->core0_v_enable_width_max = 1024;
+       } else if (is_meson_g12a_cpu() ||
                is_meson_g12b_cpu() ||
                is_meson_sm1_cpu()) {
-               sr_support |= SUPER_CORE0_SUPPORT;
-               sr_support &= ~SUPER_CORE1_SUPPORT;
+               sr->sr_support |= SUPER_CORE0_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE1_SUPPORT;
+               sr->core0_v_disable_width_max = 4096;
+               sr->core0_v_enable_width_max = 2048;
        } else if (is_meson_gxtvbb_cpu()
                || is_meson_txl_cpu()
                || is_meson_txlx_cpu()
                || is_meson_tl1_cpu()
                || is_meson_tm2_cpu()) {
-               sr_support |= SUPER_CORE0_SUPPORT;
-               sr_support |= SUPER_CORE1_SUPPORT;
+               sr->sr_support |= SUPER_CORE0_SUPPORT;
+               sr->sr_support |= SUPER_CORE1_SUPPORT;
+               sr->core0_v_disable_width_max = 2048;
+               sr->core0_v_enable_width_max = 1024;
+               sr->core1_v_disable_width_max = 4096;
+               sr->core1_v_enable_width_max = 2048;
        } else {
-               sr_support &= ~SUPER_CORE0_SUPPORT;
-               sr_support &= ~SUPER_CORE1_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE0_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE1_SUPPORT;
        }
        if (super_scaler == 0) {
-               sr_support &= ~SUPER_CORE0_SUPPORT;
-               sr_support &= ~SUPER_CORE1_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE0_SUPPORT;
+               sr->sr_support &= ~SUPER_CORE1_SUPPORT;
        }
        if (is_meson_g12a_cpu() ||
                is_meson_g12b_cpu() ||
                is_meson_sm1_cpu()) {
-               sr_reg_offt = 0xc00;
-               sr_reg_offt2 = 0x00;
+               sr->sr_reg_offt = 0xc00;
+               sr->sr_reg_offt2 = 0x00;
        } else if (is_meson_tl1_cpu()
                || is_meson_tm2_cpu()) {
-               sr_reg_offt = 0xc00;
-               sr_reg_offt2 = 0xc80;
+               sr->sr_reg_offt = 0xc00;
+               sr->sr_reg_offt2 = 0xc80;
        } else {
-               sr_reg_offt = 0;
-               sr_reg_offt2 = 0x00;
+               sr->sr_reg_offt = 0;
+               sr->sr_reg_offt2 = 0x00;
        }
 }
 /*for gxlx only have core1 which will affact pip line*/

diff --git a/include/linux/amlogic/media/video_sink/vpp.h b/include/linux/amlogic/media/video_sink/vpp.h
index f4b8eb65201e06dee13d4ddfb81e0430214c00b4..4f70600212ec862ec5778128b4f8957d1a757253 100644 (file)
--- a/include/linux/amlogic/media/video_sink/vpp.h
+++ b/include/linux/amlogic/media/video_sink/vpp.h
@@ -222,11 +222,18 @@ enum select_scaler_path_e {
 * if core1 v disable,core1 input width max=4096;
 * gxlx only have core1,txhd/g12a only have core0
 */
-#define SUPER_CORE0_WIDTH_MAX  2048
-#define SUPER_CORE1_WIDTH_MAX  4096
 #define SUPER_CORE0_SUPPORT  (1 << 0)
 #define SUPER_CORE1_SUPPORT  (1 << 1)
 
+struct sr_info_s {
+       u32 sr_support;
+       u32 core0_v_enable_width_max;
+       u32 core0_v_disable_width_max;
+       u32 core1_v_enable_width_max;
+       u32 core1_v_disable_width_max;
+       u32 sr_reg_offt;
+       u32 sr_reg_offt2;       /*for tl1*/
+};
 
 #ifdef TV_3D_FUNCTION_OPEN
 /*cmd use for 3d operation*/