drm/amd/display: add sharpening policy to plane state

[Why]
Pass in sharpening policy through plane state from control side

[How]
Add sharpener support through dc_caps.
Add sharpen policy to plane state and move to spl_input.
Pass sharpen policy from plane state to SPL.

Reviewed-by: Aric Cyr <aric.cyr@amd.com>
Signed-off-by: Samson Tam <Samson.Tam@amd.com>
Signed-off-by: Roman Li <roman.li@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 621444a1f1906160e90375dd50397171e49cb73d..ad8e2a91c3062f7f8023d7e75625f8edf2cbf1e9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -227,6 +227,10 @@ struct dc_dmub_caps {
        uint8_t fams_ver;
 };
 
+struct dc_scl_caps {
+       bool sharpener_support;
+};
+
 struct dc_caps {
        uint32_t max_streams;
        uint32_t max_links;
@@ -292,6 +296,7 @@ struct dc_caps {
        bool sequential_ono;
        /* Conservative limit for DCC cases which require ODM4:1 to support*/
        uint32_t dcc_plane_width_limit;
+       struct dc_scl_caps scl_caps;
 };
 
 struct dc_bug_wa {
@@ -1355,6 +1360,7 @@ struct dc_plane_state {
        enum mpcc_movable_cm_location mcm_location;
        struct dc_csc_transform cursor_csc_color_matrix;
        bool adaptive_sharpness_en;
+       int adaptive_sharpness_policy;
        int sharpness_level;
        enum linear_light_scaling linear_light_scaling;
        unsigned int sdr_white_level_nits;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
index 20fd0afca8cb0191b14bc4f5de5c7ca1ce27c762..eeffe44be9e32bfb401265e4af9304d9a424afcb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
@@ -188,7 +188,7 @@ void translate_SPL_in_params_from_pipe_ctx(struct pipe_ctx *pipe_ctx, struct spl
        spl_in->h_active = pipe_ctx->plane_res.scl_data.h_active;
        spl_in->v_active = pipe_ctx->plane_res.scl_data.v_active;
 
-       spl_in->debug.sharpen_policy = (enum sharpen_policy)pipe_ctx->stream->ctx->dc->debug.sharpen_policy;
+       spl_in->sharpen_policy = (enum sharpen_policy)plane_state->adaptive_sharpness_policy;
        spl_in->debug.scale_to_sharpness_policy =
                (enum scale_to_sharpness_policy)pipe_ctx->stream->ctx->dc->debug.scale_to_sharpness_policy;
 

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
index 7da81966b4df3098030463dc7ea45b8f908f0fda..46feff9348d9637a81b9f5971558656883bd423e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
@@ -2171,6 +2171,7 @@ static bool dcn401_resource_construct(
        /* SPL */
        spl_init_easf_filter_coeffs();
        spl_init_blur_scale_coeffs();
+       dc->caps.scl_caps.sharpener_support = true;
 
        return true;
 

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c b/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c
index c38a5c8646e86776c4f719dd83b0b2fa5719e97e..f043c7e32e169ecdd63a171f95954410f90d8c6c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c
+++ b/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c
@@ -848,13 +848,13 @@ static bool spl_get_isharp_en(struct spl_in *spl_in,
         *  surfaces based on policy setting
         */
        if (!spl_is_yuv420(spl_in->basic_in.format) &&
-               (spl_in->debug.sharpen_policy == SHARPEN_YUV))
+               (spl_in->sharpen_policy == SHARPEN_YUV))
                return enable_isharp;
        else if ((spl_is_yuv420(spl_in->basic_in.format) && !fullscreen) &&
-               (spl_in->debug.sharpen_policy == SHARPEN_RGB_FULLSCREEN_YUV))
+               (spl_in->sharpen_policy == SHARPEN_RGB_FULLSCREEN_YUV))
                return enable_isharp;
        else if (!spl_in->is_fullscreen &&
-                       spl_in->debug.sharpen_policy == SHARPEN_FULLSCREEN_ALL)
+                       spl_in->sharpen_policy == SHARPEN_FULLSCREEN_ALL)
                return enable_isharp;
 
        /*

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h b/drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h
index 48e4217555f8439c7effda7514404b0445bb4522..fcb5d389592bef5978797ca7a1909e836e31931f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h
+++ b/drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h
@@ -508,7 +508,6 @@ struct spl_funcs    {
 struct spl_debug {
        int visual_confirm_base_offset;
        int visual_confirm_dpp_offset;
-       enum sharpen_policy sharpen_policy;
        enum scale_to_sharpness_policy scale_to_sharpness_policy;
 };
 
@@ -530,6 +529,7 @@ struct spl_in       {
        int h_active;
        int v_active;
        int sdr_white_level_nits;
+       enum sharpen_policy sharpen_policy;
 };
 // end of SPL inputs