drm/amd/display: add color space option when sending link test pattern

[why]
In the TEST_MSIC dpcd register field definition, the test equipment
has the option to choose between YCbCr601 or YCbCr709.
We will apply corresponding YCbCr coefficient based on this test
request.

[how]
Add a new input parameter in dc_link_dp_set_test_pattern to allow the
selection between different color space.

Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Nikola Cornij <Nikola.Cornij@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
index bdb37e611015fa1ff7def78c7140aa518be436a6..f81d3439ee8cb4b60ec97a6cb8539b9519bf72b0 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -657,6 +657,7 @@ static ssize_t dp_phy_test_pattern_debugfs_write(struct file *f, const char __us
        dc_link_set_test_pattern(
                link,
                test_pattern,
+               DP_TEST_PATTERN_COLOR_SPACE_RGB,
                &link_training_settings,
                custom_pattern,
                10);

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index cfb8f901067352e9bda96de7f6cfebb1d8a528e4..123b79dcd8e4e333858a013345a09594f1ff3055 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -3319,6 +3319,7 @@ void dc_link_disable_hpd(const struct dc_link *link)
 
 void dc_link_set_test_pattern(struct dc_link *link,
                              enum dp_test_pattern test_pattern,
+                             enum dp_test_pattern_color_space test_pattern_color_space,
                              const struct link_training_settings *p_link_settings,
                              const unsigned char *p_custom_pattern,
                              unsigned int cust_pattern_size)
@@ -3327,6 +3328,7 @@ void dc_link_set_test_pattern(struct dc_link *link,
                dc_link_dp_set_test_pattern(
                        link,
                        test_pattern,
+                       test_pattern_color_space,
                        p_link_settings,
                        p_custom_pattern,
                        cust_pattern_size);

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index b72db01afeedc08b871ed8660a250220b5441811..272261192e82974a3f3dcbdc11af39fb811bc2e2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -2493,6 +2493,7 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link)
        dc_link_dp_set_test_pattern(
                link,
                test_pattern,
+               DP_TEST_PATTERN_COLOR_SPACE_UNDEFINED,
                &link_training_settings,
                test_80_bit_pattern,
                (DP_TEST_80BIT_CUSTOM_PATTERN_79_72 -
@@ -2504,6 +2505,8 @@ static void dp_test_send_link_test_pattern(struct dc_link *link)
        union link_test_pattern dpcd_test_pattern;
        union test_misc dpcd_test_params;
        enum dp_test_pattern test_pattern;
+       enum dp_test_pattern_color_space test_pattern_color_space =
+                       DP_TEST_PATTERN_COLOR_SPACE_UNDEFINED;
 
        memset(&dpcd_test_pattern, 0, sizeof(dpcd_test_pattern));
        memset(&dpcd_test_params, 0, sizeof(dpcd_test_params));
@@ -2538,9 +2541,14 @@ static void dp_test_send_link_test_pattern(struct dc_link *link)
        break;
        }
 
+       test_pattern_color_space = dpcd_test_params.bits.YCBCR_COEFS ?
+                       DP_TEST_PATTERN_COLOR_SPACE_YCBCR709 :
+                       DP_TEST_PATTERN_COLOR_SPACE_YCBCR601;
+
        dc_link_dp_set_test_pattern(
                        link,
                        test_pattern,
+                       test_pattern_color_space,
                        NULL,
                        NULL,
                        0);
@@ -3426,7 +3434,8 @@ static bool is_dp_phy_pattern(enum dp_test_pattern test_pattern)
 
 static void set_crtc_test_pattern(struct dc_link *link,
                                struct pipe_ctx *pipe_ctx,
-                               enum dp_test_pattern test_pattern)
+                               enum dp_test_pattern test_pattern,
+                               enum dp_test_pattern_color_space test_pattern_color_space)
 {
        enum controller_dp_test_pattern controller_test_pattern;
        enum dc_color_depth color_depth = pipe_ctx->
@@ -3484,8 +3493,27 @@ static void set_crtc_test_pattern(struct dc_link *link,
                                controller_test_pattern, color_depth);
                else if (opp->funcs->opp_set_disp_pattern_generator) {
                        struct pipe_ctx *odm_pipe;
+                       enum controller_dp_color_space controller_color_space;
                        int opp_cnt = 1;
 
+                       switch (test_pattern_color_space) {
+                       case DP_TEST_PATTERN_COLOR_SPACE_RGB:
+                               controller_color_space = CONTROLLER_DP_COLOR_SPACE_RGB;
+                               break;
+                       case DP_TEST_PATTERN_COLOR_SPACE_YCBCR601:
+                               controller_color_space = CONTROLLER_DP_COLOR_SPACE_YCBCR601;
+                               break;
+                       case DP_TEST_PATTERN_COLOR_SPACE_YCBCR709:
+                               controller_color_space = CONTROLLER_DP_COLOR_SPACE_YCBCR709;
+                               break;
+                       case DP_TEST_PATTERN_COLOR_SPACE_UNDEFINED:
+                       default:
+                               controller_color_space = CONTROLLER_DP_COLOR_SPACE_UDEFINED;
+                               DC_LOG_ERROR("%s: Color space must be defined for test pattern", __func__);
+                               ASSERT(0);
+                               break;
+                       }
+
                        for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
                                opp_cnt++;
 
@@ -3497,6 +3525,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                                odm_opp->funcs->opp_program_bit_depth_reduction(odm_opp, &params);
                                odm_opp->funcs->opp_set_disp_pattern_generator(odm_opp,
                                        controller_test_pattern,
+                                       controller_color_space,
                                        color_depth,
                                        NULL,
                                        width,
@@ -3504,6 +3533,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                        }
                        opp->funcs->opp_set_disp_pattern_generator(opp,
                                controller_test_pattern,
+                               controller_color_space,
                                color_depth,
                                NULL,
                                width,
@@ -3535,6 +3565,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                                odm_opp->funcs->opp_program_bit_depth_reduction(odm_opp, &params);
                                odm_opp->funcs->opp_set_disp_pattern_generator(odm_opp,
                                        CONTROLLER_DP_TEST_PATTERN_VIDEOMODE,
+                                       CONTROLLER_DP_COLOR_SPACE_UDEFINED,
                                        color_depth,
                                        NULL,
                                        width,
@@ -3542,6 +3573,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                        }
                        opp->funcs->opp_set_disp_pattern_generator(opp,
                                CONTROLLER_DP_TEST_PATTERN_VIDEOMODE,
+                               CONTROLLER_DP_COLOR_SPACE_UDEFINED,
                                color_depth,
                                NULL,
                                width,
@@ -3558,6 +3590,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
 bool dc_link_dp_set_test_pattern(
        struct dc_link *link,
        enum dp_test_pattern test_pattern,
+       enum dp_test_pattern_color_space test_pattern_color_space,
        const struct link_training_settings *p_link_settings,
        const unsigned char *p_custom_pattern,
        unsigned int cust_pattern_size)
@@ -3586,7 +3619,7 @@ bool dc_link_dp_set_test_pattern(
        if (link->test_pattern_enabled && test_pattern ==
                        DP_TEST_PATTERN_VIDEO_MODE) {
                /* Set CRTC Test Pattern */
-               set_crtc_test_pattern(link, pipe_ctx, test_pattern);
+               set_crtc_test_pattern(link, pipe_ctx, test_pattern, test_pattern_color_space);
                dp_set_hw_test_pattern(link, test_pattern,
                                (uint8_t *)p_custom_pattern,
                                (uint32_t)cust_pattern_size);
@@ -3701,7 +3734,7 @@ bool dc_link_dp_set_test_pattern(
                }
        } else {
        /* CRTC Patterns */
-               set_crtc_test_pattern(link, pipe_ctx, test_pattern);
+               set_crtc_test_pattern(link, pipe_ctx, test_pattern, test_pattern_color_space);
                /* Set Test Pattern state */
                link->test_pattern_enabled = true;
        }

diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
index 1b68d7c1308534fb731e95aa1c9c2f2ab53855e9..dfe4472c9e404eb8ecc569a9ea4199b7926641cc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
@@ -522,14 +522,14 @@ union link_test_pattern {
 
 union test_misc {
        struct dpcd_test_misc_bits {
-               unsigned char SYNC_CLOCK :1;
+               unsigned char SYNC_CLOCK  :1;
                /* dpcd_test_color_format */
-               unsigned char CLR_FORMAT :2;
+               unsigned char CLR_FORMAT  :2;
                /* dpcd_test_dyn_range */
-               unsigned char DYN_RANGE  :1;
-               unsigned char YCBCR      :1;
+               unsigned char DYN_RANGE   :1;
+               unsigned char YCBCR_COEFS :1;
                /* dpcd_test_bit_depth */
-               unsigned char BPC        :3;
+               unsigned char BPC         :3;
        } bits;
        unsigned char raw;
 };

diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h
index 314d2043cd7878bed07f84d5bb6d9e83050f8956..1ff79f703734090ce5ffdba22e65e55ae7717acc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_link.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_link.h
@@ -257,6 +257,7 @@ void dc_link_dp_disable_hpd(const struct dc_link *link);
 bool dc_link_dp_set_test_pattern(
        struct dc_link *link,
        enum dp_test_pattern test_pattern,
+       enum dp_test_pattern_color_space test_pattern_color_space,
        const struct link_training_settings *p_link_settings,
        const unsigned char *p_custom_pattern,
        unsigned int cust_pattern_size);
@@ -288,6 +289,7 @@ void dc_link_enable_hpd(const struct dc_link *link);
 void dc_link_disable_hpd(const struct dc_link *link);
 void dc_link_set_test_pattern(struct dc_link *link,
                        enum dp_test_pattern test_pattern,
+                       enum dp_test_pattern_color_space test_pattern_color_space,
                        const struct link_training_settings *p_link_settings,
                        const unsigned char *p_custom_pattern,
                        unsigned int cust_pattern_size);

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index 0046a099c9e94de5064729358aa3d90e86c8178f..4d36b9e415f19536050581fa81e5773556753f7a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -223,6 +223,7 @@ void dcn20_init_blank(
        opp->funcs->opp_set_disp_pattern_generator(
                        opp,
                        CONTROLLER_DP_TEST_PATTERN_SOLID_COLOR,
+                       CONTROLLER_DP_COLOR_SPACE_UDEFINED,
                        COLOR_DEPTH_UNDEFINED,
                        &black_color,
                        otg_active_width,
@@ -232,6 +233,7 @@ void dcn20_init_blank(
                bottom_opp->funcs->opp_set_disp_pattern_generator(
                                bottom_opp,
                                CONTROLLER_DP_TEST_PATTERN_SOLID_COLOR,
+                               CONTROLLER_DP_COLOR_SPACE_UDEFINED,
                                COLOR_DEPTH_UNDEFINED,
                                &black_color,
                                otg_active_width,
@@ -851,6 +853,7 @@ void dcn20_blank_pixel_data(
        struct dc_stream_state *stream = pipe_ctx->stream;
        enum dc_color_space color_space = stream->output_color_space;
        enum controller_dp_test_pattern test_pattern = CONTROLLER_DP_TEST_PATTERN_SOLID_COLOR;
+       enum controller_dp_color_space test_pattern_color_space = CONTROLLER_DP_COLOR_SPACE_UDEFINED;
        struct pipe_ctx *odm_pipe;
        int odm_cnt = 1;
 
@@ -869,8 +872,10 @@ void dcn20_blank_pixel_data(
                if (stream_res->abm)
                        stream_res->abm->funcs->set_abm_immediate_disable(stream_res->abm);
 
-               if (dc->debug.visual_confirm != VISUAL_CONFIRM_DISABLE)
+               if (dc->debug.visual_confirm != VISUAL_CONFIRM_DISABLE) {
                        test_pattern = CONTROLLER_DP_TEST_PATTERN_COLORSQUARES;
+                       test_pattern_color_space = CONTROLLER_DP_COLOR_SPACE_RGB;
+               }
        } else {
                test_pattern = CONTROLLER_DP_TEST_PATTERN_VIDEOMODE;
        }
@@ -878,6 +883,7 @@ void dcn20_blank_pixel_data(
        stream_res->opp->funcs->opp_set_disp_pattern_generator(
                        stream_res->opp,
                        test_pattern,
+                       test_pattern_color_space,
                        stream->timing.display_color_depth,
                        &black_color,
                        width,
@@ -888,6 +894,7 @@ void dcn20_blank_pixel_data(
                                odm_pipe->stream_res.opp,
                                dc->debug.visual_confirm != VISUAL_CONFIRM_DISABLE && blank ?
                                                CONTROLLER_DP_TEST_PATTERN_COLORRAMP : test_pattern,
+                               test_pattern_color_space,
                                stream->timing.display_color_depth,
                                &black_color,
                                width,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c
index 40164ed015ea5de34bea1f54ee6a8e713a3d810e..023cc71fad0f55f02232b88a5cd0c3875993c398 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c
@@ -41,6 +41,7 @@
 void opp2_set_disp_pattern_generator(
                struct output_pixel_processor *opp,
                enum controller_dp_test_pattern test_pattern,
+               enum controller_dp_color_space color_space,
                enum dc_color_depth color_depth,
                const struct tg_color *solid_color,
                int width,
@@ -100,9 +101,22 @@ void opp2_set_disp_pattern_generator(
                                TEST_PATTERN_DYN_RANGE_CEA :
                                TEST_PATTERN_DYN_RANGE_VESA);
 
+               switch (color_space) {
+               case CONTROLLER_DP_COLOR_SPACE_YCBCR601:
+                       mode = TEST_PATTERN_MODE_COLORSQUARES_YCBCR601;
+               break;
+               case CONTROLLER_DP_COLOR_SPACE_YCBCR709:
+                       mode = TEST_PATTERN_MODE_COLORSQUARES_YCBCR709;
+               break;
+               case CONTROLLER_DP_COLOR_SPACE_RGB:
+               default:
+                       mode = TEST_PATTERN_MODE_COLORSQUARES_RGB;
+               break;
+               }
+
                REG_UPDATE_6(DPG_CONTROL,
                        DPG_EN, 1,
-                       DPG_MODE, TEST_PATTERN_MODE_COLORSQUARES_RGB,
+                       DPG_MODE, mode,
                        DPG_DYNAMIC_RANGE, dyn_range,
                        DPG_BIT_DEPTH, bit_depth,
                        DPG_VRES, 6,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h
index abd8de9a78f8b0662fab3b03c7d742cc67642eb4..4093bec172c181479a31aaf276349ae2975f3bf0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h
@@ -140,6 +140,7 @@ void dcn20_opp_construct(struct dcn20_opp *oppn20,
 void opp2_set_disp_pattern_generator(
        struct output_pixel_processor *opp,
        enum controller_dp_test_pattern test_pattern,
+       enum controller_dp_color_space color_space,
        enum dc_color_depth color_depth,
        const struct tg_color *solid_color,
        int width,

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
index 99ae8181d429398325a5cf01782e07a57121c54b..75d419081e76ec3ba78baa9636d40f9c50d845f0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
@@ -245,6 +245,13 @@ enum controller_dp_test_pattern {
        CONTROLLER_DP_TEST_PATTERN_SOLID_COLOR
 };
 
+enum controller_dp_color_space {
+       CONTROLLER_DP_COLOR_SPACE_RGB,
+       CONTROLLER_DP_COLOR_SPACE_YCBCR601,
+       CONTROLLER_DP_COLOR_SPACE_YCBCR709,
+       CONTROLLER_DP_COLOR_SPACE_UDEFINED
+};
+
 enum dc_lut_mode {
        LUT_BYPASS,
        LUT_RAM_A,

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
index e2d960e5fc1cdfa9abad43d2e7f2110554929e51..7575564b2265af7f50ab1c473e361a2eaff9cb55 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
@@ -306,6 +306,7 @@ struct opp_funcs {
        void (*opp_set_disp_pattern_generator)(
                        struct output_pixel_processor *opp,
                        enum controller_dp_test_pattern test_pattern,
+                       enum controller_dp_color_space color_space,
                        enum dc_color_depth color_depth,
                        const struct tg_color *solid_color,
                        int width,

diff --git a/drivers/gpu/drm/amd/display/include/link_service_types.h b/drivers/gpu/drm/amd/display/include/link_service_types.h
index 876b0b3e1a9c9193bd93736138ae333365ba0552..4869d4562e4d8852075e406404963208135b81f1 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/link_service_types.h
+++ b/drivers/gpu/drm/amd/display/include/link_service_types.h
@@ -123,6 +123,13 @@ enum dp_test_pattern {
        DP_TEST_PATTERN_UNSUPPORTED
 };
 
+enum dp_test_pattern_color_space {
+       DP_TEST_PATTERN_COLOR_SPACE_RGB,
+       DP_TEST_PATTERN_COLOR_SPACE_YCBCR601,
+       DP_TEST_PATTERN_COLOR_SPACE_YCBCR709,
+       DP_TEST_PATTERN_COLOR_SPACE_UNDEFINED
+};
+
 enum dp_panel_mode {
        /* not required */
        DP_PANEL_MODE_DEFAULT,