Attachment 139070 Details for Bug 106159 – [PATCH 2/2] drm/amd/display: Check dc_sink every time in MST hotplug

[patch] [PATCH 2/2] drm/amd/display: Check dc_sink every time in MST hotplug

0002-drm-amd-display-Check-dc_sink-every-time-in-MST-hotp.patch (text/plain), 2.27 KB, created by Harry Wentland on 2018-04-24 19:31:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harry Wentland

Created: 2018-04-24 19:31:11 UTC

Size: 2.27 KB

patch

obsolete

>From 6d6a5fbde17585511fa3060d260c53fa61aaf1e2 Mon Sep 17 00:00:00 2001
>From: "Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com>
>Date: Tue, 17 Apr 2018 14:39:09 -0400
>Subject: [PATCH] drm/amd/display: Check dc_sink every time in MST hotplug
>
>Extended fix to: "Don't read EDID in atomic_check"
>
>Fix issue of missing dc_sink in .mode_valid in hot plug routine.
>
>Need to check dc_sink everytime in .get_modes hook after checking
>edid, since edid is not getting removed in hot unplug but dc_sink
>doesn't.
>
>Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
>Reviewed-by: Roman Li <Roman.Li@amd.com>
>Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
>---
> .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c  | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
>index 149178594f0c..c3f3028253c3 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
>@@ -227,10 +227,6 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> 
> 	if (!aconnector->edid) {
> 		struct edid *edid;
>-		struct dc_sink *dc_sink;
>-		struct dc_sink_init_data init_params = {
>-				.link = aconnector->dc_link,
>-				.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
> 		edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
> 
> 		if (!edid) {
>@@ -241,11 +237,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> 		}
> 
> 		aconnector->edid = edid;
>+	}
> 
>+	if (!aconnector->dc_sink) {
>+		struct dc_sink *dc_sink;
>+		struct dc_sink_init_data init_params = {
>+				.link = aconnector->dc_link,
>+				.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
> 		dc_sink = dc_link_add_remote_sink(
> 			aconnector->dc_link,
>-			(uint8_t *)edid,
>-			(edid->extensions + 1) * EDID_LENGTH,
>+			(uint8_t *)aconnector->edid,
>+			(aconnector->edid->extensions + 1) * EDID_LENGTH,
> 			&init_params);
> 
> 		dc_sink->priv = aconnector;
>@@ -253,7 +255,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> 
> 		if (aconnector->dc_sink)
> 			amdgpu_dm_update_freesync_caps(
>-					connector, edid);
>+					connector, aconnector->edid);
> 	}
> 
> 	drm_mode_connector_update_edid_property(
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 106159: 138956 | 138957 | 138958 | 138959 | 139069 | 139070 | 139100 | 139101 | 139112 | 139132 | 139134

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.