Attachment 133672 Details for Bug 102323 – Draft fix

[patch] Draft fix

0001-drm-amd-display-Create-fake-sink-if-needed-when-comm.patch (text/plain), 1.99 KB, created by Harry Wentland on 2017-08-22 14:57:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harry Wentland

Created: 2017-08-22 14:57:04 UTC

Size: 1.99 KB

patch

obsolete

>From 68ea5bad72cfdd74159b06374953952d3552e8ad Mon Sep 17 00:00:00 2001
>From: Harry Wentland <harry.wentland@amd.com>
>Date: Thu, 17 Aug 2017 14:58:07 -0400
>Subject: [PATCH] drm/amd/display: Create fake sink if needed when commit
> stream
>
>The problem we're trying to fix is this (and similar):
>1) X Desktop with single display
>2) VT switch
>3) Unplug display
>4) VT switch back to X
>5) re-plug same display
>
>Before this we'd fail at step 4 when trying to create a dc_stream_state
>because of a missing sink. This change will fake a sink in this case.
>
>The same scenario applies to S3 resume.
>
>Change-Id: I7bbaefc889f91021abb36e3caa6906390ab6678b
>Signed-off-by: Harry Wentland <harry.wentland@amd.com>
>---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
>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 73a0fdb98cbd..98359e31e504 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -2278,6 +2278,22 @@ static void decide_crtc_timing_for_drm_display_mode(
> 	}
> }
> 
>+static void create_fake_sink(struct amdgpu_connector *aconnector)
>+{
>+	struct dc_sink *sink = NULL;
>+	struct dc_sink_init_data sink_init_data = { 0 };
>+
>+	sink_init_data.link = aconnector->dc_link;
>+	sink_init_data.sink_signal = aconnector->dc_link->connector_signal;
>+
>+	sink = dc_sink_create(&sink_init_data);
>+	if (!sink)
>+		DRM_ERROR("Failed to create sink!\n");
>+
>+	aconnector->dc_sink = sink;
>+	aconnector->dc_link->local_sink = sink;
>+}
>+
> static struct dc_stream_state *create_stream_for_sink(
> 		struct amdgpu_connector *aconnector,
> 		const struct drm_display_mode *drm_mode,
>@@ -2300,6 +2316,10 @@ static struct dc_stream_state *create_stream_for_sink(
> 	}
> 
> 	drm_connector = &aconnector->base;
>+
>+	if (!aconnector->dc_sink)
>+		create_fake_sink(aconnector);
>+
> 	stream = dc_create_stream_for_sink(aconnector->dc_sink);
> 
> 	if (stream == NULL) {
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 102323: 133672

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.