[PATCH 073/120] drm/amd/display: fix >340 Mhz with deep color pipe split no display

[Harry Wentland]

From: Andrey Grodzovsky <andrey.grodzov...@amd.com>

[Description]
 the input to HW formula needs to take care the deep color.

Change-Id: Ic1ee35224110dafa69554d4e60a77a079e457883
Signed-off-by: Charlene Liu <charlene....@amd.com>
Reviewed-by: Charlene Liu <charlene....@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c  | 13 ++++++++++++-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c |  2 --
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c 
b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index c809ad3738e9..7f7cb8ff124d 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -856,7 +856,18 @@ bool dcn_validate_bandwidth(
                                - pipe->stream->timing.v_front_porch;
                v->vactive[input_idx] = pipe->stream->timing.v_addressable;
                v->pixel_clock[input_idx] = pipe->stream->timing.pix_clk_khz / 
1000.0f;
-
+               if (pipe->stream->sink->sink_signal ==  
SIGNAL_TYPE_HDMI_TYPE_A) {
+                       switch (pipe->stream->timing.display_color_depth) {
+                       case COLOR_DEPTH_101010:
+                                       v->pixel_clock[input_idx]  = 
(v->pixel_clock[input_idx] * 30) / 24;
+                               break;
+                       case COLOR_DEPTH_121212:
+                               v->pixel_clock[input_idx]  = 
(v->pixel_clock[input_idx] * 36) / 24;
+                               break;
+                       default:
+                               break;
+                       }
+               }
 
                if (!pipe->surface){
                        v->dcc_enable[input_idx] = dcn_bw_yes;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c 
b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index a34b2562ff7a..84efe7216d90 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1657,8 +1657,6 @@ static void set_avi_info_frame(
                        color_space == COLOR_SPACE_YCBCR601_LIMITED)
                hdmi_info->bits.C0_C1 = COLORIMETRY_ITU601;
        else {
-               if (stream->timing.pixel_encoding != PIXEL_ENCODING_RGB)
-                       BREAK_TO_DEBUGGER();
                hdmi_info->bits.C0_C1 = COLORIMETRY_NO_DATA;
        }
        if (color_space == COLOR_SPACE_2020_RGB_FULLRANGE ||
-- 
2.11.0

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