Attachment 140449 Details for Bug 106959 – This patch should fix the issue for you. It hasn't been pushed to the kernel tree since it is in our internal staging branch, but it should be released soon.

[patch] This patch should fix the issue for you. It hasn't been pushed to the kernel tree since it is in our internal staging branch, but it should be released soon.

0001-drm-amdgpu-add-a-check-for-display-depth-validity.patch (text/plain), 3.70 KB, created by Mikita Lipski on 2018-07-03 13:53:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikita Lipski

Created: 2018-07-03 13:53:45 UTC

Size: 3.70 KB

patch

obsolete

>From efcb0a1898f8609fb57729defe8c973191d3396e Mon Sep 17 00:00:00 2001
>From: Mikita Lipski <mikita.lipski@amd.com>
>Date: Tue, 3 Jul 2018 09:42:51 -0400
>Subject: [PATCH] drm/amdgpu: add a check for display depth validity
>
>[why]
>HDMI 2.0 fails to validate 4K@60 timing with 10 bpc
>[how]
>Adding a helper function that would verify if the display depth
>assigned would pass a bandwidth validation.
>Drop the display depth by one level if TMDS max clock is higer
>
>Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/Kconfig                |  2 +-
> drivers/gpu/drm/amd/amdgpu/Makefile               |  2 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 +++++++++++++++++++++++
> 3 files changed, 44 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
>index e8af1f5..d4d25c3 100644
>--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
>+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
>@@ -41,4 +41,4 @@ config DRM_AMDGPU_GART_DEBUGFS
> 	  pages. Uses more memory for housekeeping, enable only for debugging.
> 
> source "drivers/gpu/drm/amd/acp/Kconfig"
>-source "drivers/gpu/drm/amd/display/Kconfig"
>+source "drivers/gpu/drm/amd/dal-dev/Kconfig"
>diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
>index bfd332c..ae2ca52 100644
>--- a/drivers/gpu/drm/amd/amdgpu/Makefile
>+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
>@@ -24,7 +24,7 @@
> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
> 
> FULL_AMD_PATH=$(src)/..
>-DISPLAY_FOLDER_NAME=display
>+DISPLAY_FOLDER_NAME=dal-dev
> FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME)
> 
> ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \
>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>index 01d14d8..b5268dd 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -2218,6 +2218,46 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing)
> 	return color_space;
> }
> 
>+static void reduce_mode_colour_depth(struct dc_crtc_timing *timing_out)
>+{
>+	if (timing_out->display_color_depth <= COLOR_DEPTH_888)
>+		return;
>+
>+	timing_out->display_color_depth--;
>+}
>+
>+static void check_if_display_depth_is_supported(struct dc_crtc_timing *timing_out,
>+						const struct drm_display_info *info)
>+{
>+	int normalized_clk;
>+	if (timing_out->display_color_depth <= COLOR_DEPTH_888)
>+		return;
>+	do {
>+		normalized_clk = timing_out->pix_clk_khz;
>+		/* YCbCr 4:2:0 requires additional adjustment of 1/2 */
>+		if (timing_out->pixel_encoding == PIXEL_ENCODING_YCBCR420)
>+			normalized_clk /= 2;
>+		/* Adjusting pix clock following on HDMI spec based on colour depth */
>+		switch (timing_out->display_color_depth) {
>+		case COLOR_DEPTH_101010:
>+			normalized_clk = (normalized_clk * 30) / 24;
>+			break;
>+		case COLOR_DEPTH_121212:
>+			normalized_clk = (normalized_clk * 36) / 24;
>+			break;
>+		case COLOR_DEPTH_161616:
>+			normalized_clk = (normalized_clk * 48) / 24;
>+			break;
>+		default:
>+			return;
>+		}
>+		if (normalized_clk <= info->max_tmds_clock)
>+			return;
>+		reduce_mode_colour_depth(timing_out);
>+
>+	} while (timing_out->display_color_depth > COLOR_DEPTH_888);
>+
>+}
> /*****************************************************************************/
> 
> static void
>@@ -2271,6 +2311,8 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
> 
> 	stream->out_transfer_func->type = TF_TYPE_PREDEFINED;
> 	stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
>+	if (stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
>+		check_if_display_depth_is_supported(timing_out, info);
> }
> 
> static void fill_audio_info(struct audio_info *audio_info,
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 106959: 140217 | 140218 | 140219 | 140220 | 140247 | 140248 | 140256 | 140266 | 140267 | 140449 | 140450 | 140464

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.