diff options
| author | Andrey Grodzovsky | 2017-07-29 00:21:22 +0200 |
|---|---|---|
| committer | Alex Deucher | 2017-09-27 00:16:00 +0200 |
| commit | b701542d29d61c3514f51496168831c8476a8e2a (patch) | |
| tree | 59f3e6a80fd2bfa0576b6ee225a5c14871f90d2a /drivers/gpu/drm | |
| parent | drm/amd/display: fix bw_calc for hdmi and 420 outputs (diff) | |
| download | kernel-qcow2-linux-b701542d29d61c3514f51496168831c8476a8e2a.tar.gz kernel-qcow2-linux-b701542d29d61c3514f51496168831c8476a8e2a.tar.xz kernel-qcow2-linux-b701542d29d61c3514f51496168831c8476a8e2a.zip | |
drm/amd/display: fix >340 Mhz with deep color pipe split no display
the input to HW formula needs to take care the deep color.
Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 13 | ||||
| -rw-r--r-- | 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 1f4237fc3e53..566a1bed9828 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 || |