From: Eric Bernstein <eric.bernst...@amd.com>

Update MSA MISC1 bit 6 programming to handle YCbCr 4:2:0
and BT2020 cases.

Signed-off-by: Eric Bernstein <eric.bernst...@amd.com>
Reviewed-by: Hersen Wu <hersenxs...@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c 
b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
index c928ee4cd382..147f61416fa5 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
@@ -298,9 +298,20 @@ void enc1_stream_encoder_dp_set_stream_attribute(
        }
 
        misc1 = REG_READ(DP_MSA_MISC);
+       /* For YCbCr420 and BT2020 Colorimetry Formats, VSC SDP shall be used.
+        * When MISC1, bit 6, is Set to 1, a Source device uses a VSC SDP to 
indicate the
+        * Pixel Encoding/Colorimetry Format and that a Sink device shall 
ignore MISC1, bit 7,
+        * and MISC0, bits 7:1 (MISC1, bit 7, and MISC0, bits 7:1, become 
“don’t care”).
+        */
+       if ((crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420) ||
+                       (output_color_space == COLOR_SPACE_2020_YCBCR) ||
+                       (output_color_space == COLOR_SPACE_2020_RGB_FULLRANGE) 
||
+                       (output_color_space == 
COLOR_SPACE_2020_RGB_LIMITEDRANGE))
+               misc1 = misc1 | 0x40;
+       else
+               misc1 = misc1 & ~0x40;
 
        /* set color depth */
-
        switch (crtc_timing->display_color_depth) {
        case COLOR_DEPTH_666:
                REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
@@ -354,7 +365,6 @@ void enc1_stream_encoder_dp_set_stream_attribute(
 
        switch (output_color_space) {
        case COLOR_SPACE_SRGB:
-               misc0 = misc0 | 0x0;
                misc1 = misc1 & ~0x80; /* bit7 = 0*/
                dynamic_range_rgb = 0; /*full range*/
                break;
-- 
2.17.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to