vpp: tm2: add vd2 function for tm2 [2/2]

PD#SWPL-6615

Problem:
Need vd2 function

Solution:
add vd2 function for tm2:
1.vd2 pps scaler
2.disable vd2 afbc

Verify:
test pass on tm2 skt

Change-Id: I7af5de741b90e443ee065218aecb823ef06d66a7
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c
index 6d12a39..664b2ee 100644 (file)
--- a/drivers/amlogic/media/video_sink/video.c
+++ b/drivers/amlogic/media/video_sink/video.c
@@ -3190,15 +3190,10 @@ static void pip_toggle_frame(struct vframe_s *vf)
                        &pip_frame_parms[1] : &pip_frame_parms[0];
 
                update_layer_info(1);
-               if (legacy_vpp || is_meson_tl1_cpu())
-                       iret = vpp_set_filters_no_scaler(
-                               &glayer_info[1], vf,
-                               nextpip_frame_par, vinfo, 1);
-               else
-                       iret = vpp_set_filters(
-                               &glayer_info[1], vf,
-                               nextpip_frame_par, vinfo,
-                               true, 1);
+               iret = vpp_set_filters(
+                       &glayer_info[1], vf,
+                       nextpip_frame_par, vinfo,
+                       true, 1);
 
                memcpy(&gPic_info[1], &vf->pic_mode,
                        sizeof(struct vframe_pic_mode_s));
@@ -12883,6 +12878,23 @@ static int __init video_init(void)
                glayer_info[i].zorder = reference_zorder - 2 + i;
                glayer_info[i].cur_sel_port = i;
                glayer_info[i].last_sel_port = i;
+               if (legacy_vpp) {
+                       glayer_info[i].afbc_support = true;
+                       glayer_info[i].pps_support =
+                               (i == 0) ? true : false;
+               } else if (is_meson_tl1_cpu()) {
+                       glayer_info[i].afbc_support =
+                               (i == 0) ? true : false;
+                       glayer_info[i].pps_support =
+                               (i == 0) ? true : false;
+               } else if (is_meson_tm2_cpu()) {
+                       glayer_info[i].afbc_support =
+                               (i == 0) ? true : false;
+                       glayer_info[i].pps_support = true;
+               } else {
+                       glayer_info[i].afbc_support = true;
+                       glayer_info[i].pps_support = true;
+               }
        }
 
        if (legacy_vpp)
@@ -12898,6 +12910,13 @@ static int __init video_init(void)
                        LAYER0_AFBC |
                        LAYER0_SCALER |
                        LAYER0_AVAIL;
+       else if (is_meson_tm2_cpu())
+               layer_cap =
+                       LAYER1_SCALER |
+                       LAYER1_AVAIL |
+                       LAYER0_AFBC |
+                       LAYER0_SCALER |
+                       LAYER0_AVAIL;
        else
                layer_cap =
                        LAYER1_AFBC |

diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c
index 72d1c69..24f493b 100644 (file)
--- a/drivers/amlogic/media/video_sink/vpp.c
+++ b/drivers/amlogic/media/video_sink/vpp.c
@@ -597,6 +597,10 @@ static unsigned int custom_ar;
 MODULE_PARM_DESC(custom_ar, "custom_ar");
 module_param(custom_ar, uint, 0664);
 
+static unsigned int force_no_compress;
+MODULE_PARM_DESC(force_no_compress, "force_no_compress");
+module_param(force_no_compress, uint, 0664);
+
 /*
  *test on txlx:
  *Time_out = (V_out/V_screen_total)/FPS_out;
@@ -886,6 +890,7 @@ static int vpp_set_filters_internal(
        s32 vpp_zoom_center_x, vpp_zoom_center_y;
        u32 crop_ratio = 1;
        u32 crop_left, crop_right, crop_top, crop_bottom;
+       bool no_compress = false;
 
        if (!input)
                return VppFilter_Fail;
@@ -1424,9 +1429,17 @@ RESTART:
 
        if ((vf->type & VIDTYPE_COMPRESS) &&
                (vf->canvas0Addr != 0) &&
-               (next_frame_par->vscale_skip_count > 1) &&
                (!next_frame_par->nocomp)) {
-               if (vpp_flags & VPP_FLAG_MORE_LOG)
+               if ((next_frame_par->vscale_skip_count > 1)
+                       || !input->afbc_support
+                       || force_no_compress)
+                       no_compress = true;
+       } else
+               no_compress = false;
+
+       if (no_compress) {
+               if ((vpp_flags & VPP_FLAG_MORE_LOG)
+                       && input->afbc_support)
                        pr_info(
                        "layer%d: Try DW buffer for compressed frame scaling.\n",
                        input->layer_id);
@@ -2502,6 +2515,7 @@ static int vpp_set_filters_no_scaler_internal(
        int ret = VppFilter_Success;
        u32 crop_ratio = 1;
        u32 crop_left, crop_right, crop_top, crop_bottom;
+       bool no_compress = false;
 
        if (!input)
                return VppFilter_Fail;
@@ -2818,9 +2832,17 @@ RESTART:
 
        if ((vf->type & VIDTYPE_COMPRESS) &&
                (vf->canvas0Addr != 0) &&
-               (next_frame_par->vscale_skip_count > 1) &&
                (!next_frame_par->nocomp)) {
-               if (vpp_flags & VPP_FLAG_MORE_LOG)
+               if ((next_frame_par->vscale_skip_count > 1)
+                       || !input->afbc_support
+                       || force_no_compress)
+                       no_compress = true;
+       } else
+               no_compress = false;
+
+       if (no_compress) {
+               if ((vpp_flags & VPP_FLAG_MORE_LOG)
+                       && input->afbc_support)
                        pr_info(
                        "layer%d: Try DW buffer for compressed frame scaling.\n",
                        input->layer_id);
@@ -2907,34 +2929,46 @@ int vpp_set_filters(
        next_frame_par->VPP_post_blend_vd_h_start_ = 0;
 
        next_frame_par->VPP_postproc_misc_ = 0x200;
-#ifdef TV_3D_FUNCTION_OPEN
        next_frame_par->vscale_skip_count = 0;
        next_frame_par->hscale_skip_count = 0;
+
+       if (vf->type & VIDTYPE_COMPRESS) {
+               src_width = vf->compWidth;
+               src_height = vf->compHeight;
+       } else {
+               src_width = vf->width;
+               src_height = vf->height;
+       }
+
+#ifdef TV_3D_FUNCTION_OPEN
        /*
         *check 3d mode change in display buffer or 3d type
         *get the source size according to 3d mode
         */
-       if (process_3d_type & MODE_3D_ENABLE) {
-               vpp_get_video_source_size(&src_width, &src_height,
-                       process_3d_type, vf, next_frame_par);
-       } else {
-               if (vf->type & VIDTYPE_COMPRESS) {
-                       src_width = vf->compWidth;
-                       src_height = vf->compHeight;
+       if (local_input.layer_id == 0) {
+               if (process_3d_type & MODE_3D_ENABLE) {
+                       vpp_get_video_source_size(
+                               &src_width, &src_height,
+                               process_3d_type,
+                               vf, next_frame_par);
                } else {
-                       src_width = vf->width;
-                       src_height = vf->height;
+                       next_frame_par->vpp_3d_mode =
+                               VPP_3D_MODE_NULL;
+                       next_frame_par->vpp_2pic_mode = 0;
+                       next_frame_par->vpp_3d_scale = 0;
                }
+               next_frame_par->trans_fmt = vf->trans_fmt;
+               get_vpp_3d_mode(process_3d_type,
+                       next_frame_par->trans_fmt,
+                       &next_frame_par->vpp_3d_mode);
+               if (local_input.vpp_3d_scale)
+                       next_frame_par->vpp_3d_scale = 1;
+       } else {
                next_frame_par->vpp_3d_mode = VPP_3D_MODE_NULL;
                next_frame_par->vpp_2pic_mode = 0;
                next_frame_par->vpp_3d_scale = 0;
+               next_frame_par->trans_fmt = vf->trans_fmt;
        }
-       next_frame_par->trans_fmt = vf->trans_fmt;
-       get_vpp_3d_mode(process_3d_type,
-               next_frame_par->trans_fmt,
-               &next_frame_par->vpp_3d_mode);
-       if (local_input.vpp_3d_scale)
-               next_frame_par->vpp_3d_scale = 1;
        amlog_mask(LOG_MASK_VPP, "%s: src_width %u,src_height %u.\n", __func__,
                src_width, src_height);
 #endif
@@ -2970,15 +3004,6 @@ int vpp_set_filters(
 
        if (vf->type & VIDTYPE_VSCALE_DISABLE)
                vpp_flags |= VPP_FLAG_VSCALE_DISABLE;
-#ifndef TV_3D_FUNCTION_OPEN
-       if (vf->type & VIDTYPE_COMPRESS) {
-               src_width = vf->compWidth;
-               src_height = vf->compHeight;
-       } else {
-               src_width = vf->width;
-               src_height = vf->height;
-       }
-#endif
 
        if ((vf->ratio_control & DISP_RATIO_ADAPTED_PICMODE)
                && !disable_adapted) {
@@ -3010,6 +3035,9 @@ int vpp_set_filters(
                }
        }
 
+       if (!local_input.pps_support)
+               wide_mode = VIDEO_WIDEOPTION_NORMAL;
+
        /* don't restore the wide mode */
        /* input->wide_mode = wide_mode; */
        vpp_flags |= wide_mode | (aspect_ratio << VPP_FLAG_AR_BITS);
@@ -3024,10 +3052,16 @@ int vpp_set_filters(
        next_frame_par->VPP_post_blend_vd_h_end_ = vinfo->width - 1;
        next_frame_par->VPP_post_blend_h_size_ = vinfo->width;
 
-       ret = vpp_set_filters_internal(
-               &local_input, src_width, src_height,
-               vinfo->width, vinfo->height,
-               vinfo, vpp_flags, next_frame_par, vf);
+       if (local_input.pps_support)
+               ret = vpp_set_filters_internal(
+                       &local_input, src_width, src_height,
+                       vinfo->width, vinfo->height,
+                       vinfo, vpp_flags, next_frame_par, vf);
+       else
+               ret = vpp_set_filters_no_scaler_internal(
+                       &local_input, src_width, src_height,
+                       vinfo->width, vinfo->height,
+                       vinfo, vpp_flags, next_frame_par, vf);
 
        /*config super scaler after set next_frame_par is calc ok for pps*/
        if (local_input.layer_id == 0)
@@ -3039,93 +3073,6 @@ int vpp_set_filters(
        return ret;
 }
 
-int vpp_set_filters_no_scaler(
-       struct disp_info_s *input,
-       struct vframe_s *vf,
-       struct vpp_frame_par_s *next_frame_par,
-       const struct vinfo_s *vinfo, u32 op_flag)
-{
-       u32 src_width = 0;
-       u32 src_height = 0;
-       u32 vpp_flags = 0;
-       u32 aspect_ratio = 0;
-       u32 wide_mode;
-       int ret = VppFilter_Fail;
-       struct disp_info_s local_input;
-
-       if (!input)
-               return ret;
-
-       WARN_ON(vinfo == NULL);
-
-       /* use local var to avoid the input data be overwriten */
-       memcpy(&local_input, input, sizeof(struct disp_info_s));
-       /* wide_mode = local_input.wide_mode; */
-       wide_mode = VIDEO_WIDEOPTION_NORMAL;
-       next_frame_par->VPP_post_blend_vd_v_start_ = 0;
-       next_frame_par->VPP_post_blend_vd_h_start_ = 0;
-
-       next_frame_par->VPP_postproc_misc_ = 0x200;
-       next_frame_par->vscale_skip_count = 0;
-       next_frame_par->hscale_skip_count = 0;
-       if (vf->type & VIDTYPE_COMPRESS) {
-               src_width = vf->compWidth;
-               src_height = vf->compHeight;
-       } else {
-               src_width = vf->width;
-               src_height = vf->height;
-       }
-#ifdef TV_3D_FUNCTION_OPEN
-       next_frame_par->vpp_3d_mode = VPP_3D_MODE_NULL;
-       next_frame_par->vpp_2pic_mode = 0;
-       next_frame_par->vpp_3d_scale = 0;
-       next_frame_par->trans_fmt = vf->trans_fmt;
-#endif
-
-       if (vf->type & VIDTYPE_INTERLACE)
-               vpp_flags = VPP_FLAG_INTERLACE_IN;
-
-       if ((vf->ratio_control & DISP_RATIO_ADAPTED_PICMODE)
-               && !disable_adapted) {
-               if (vf->pic_mode.provider == PIC_MODE_PROVIDER_WSS) {
-                       /* from wss, need add global setting */
-                       local_input.crop_top += vf->pic_mode.vs;
-                       local_input.crop_left += vf->pic_mode.hs;
-                       local_input.crop_bottom += vf->pic_mode.ve;
-                       local_input.crop_right += vf->pic_mode.he;
-               } else {
-                       /* from PQ database, final setting */
-                       local_input.crop_top = vf->pic_mode.vs;
-                       local_input.crop_left = vf->pic_mode.hs;
-                       local_input.crop_bottom = vf->pic_mode.ve;
-                       local_input.crop_right = vf->pic_mode.he;
-               }
-       }
-
-       aspect_ratio =
-               (vf->ratio_control & DISP_RATIO_ASPECT_RATIO_MASK)
-               >> DISP_RATIO_ASPECT_RATIO_BIT;
-
-       /* don't restore the wide mode */
-       /* input->wide_mode = wide_mode; */
-       vpp_flags |= wide_mode | (aspect_ratio << VPP_FLAG_AR_BITS);
-
-       if (vinfo->field_height != vinfo->height)
-               vpp_flags |= VPP_FLAG_INTERLACE_OUT;
-
-       if (op_flag & 1)
-               vpp_flags |= VPP_FLAG_MORE_LOG;
-
-       next_frame_par->VPP_post_blend_vd_v_end_ = vinfo->field_height - 1;
-       next_frame_par->VPP_post_blend_vd_h_end_ = vinfo->width - 1;
-       next_frame_par->VPP_post_blend_h_size_ = vinfo->width;
-
-       ret = vpp_set_filters_no_scaler_internal(
-               &local_input, src_width, src_height,
-               vinfo->width, vinfo->height,
-               vinfo, vpp_flags, next_frame_par, vf);
-       return ret;
-}
 s32 vpp_set_nonlinear_factor(
        struct disp_info_s *info, u32 f)
 {

diff --git a/include/linux/amlogic/media/video_sink/vpp.h b/include/linux/amlogic/media/video_sink/vpp.h
index 22a143b..3520e9c 100644 (file)
--- a/include/linux/amlogic/media/video_sink/vpp.h
+++ b/include/linux/amlogic/media/video_sink/vpp.h
@@ -188,6 +188,9 @@ struct disp_info_s {
        u32 zorder;
        u32 cur_sel_port;
        u32 last_sel_port;
+
+       bool afbc_support;
+       bool pps_support;
 };
 
 enum select_scaler_path_e {
@@ -288,12 +291,6 @@ extern int vpp_set_filters(
        const struct vinfo_s *vinfo,
        bool bypass_sr, u32 op_flag);
 
-extern int vpp_set_filters_no_scaler(
-       struct disp_info_s *input,
-       struct vframe_s *vf,
-       struct vpp_frame_par_s *next_frame_par,
-       const struct vinfo_s *vinfo, u32 op_flag);
-
 extern s32 vpp_set_nonlinear_factor(
        struct disp_info_s *info, u32 f);