Skip to contentSkip to conversation

Patch "drm/dp/mst: Check peer device type before attempting EDID read" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Nov 9, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/dp/mst: Check peer device type before attempting EDID read

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-dp-mst-check-peer-device-type-before-attempting-edid-read.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4da5caa6a6f82cda3193bca855235b87debf78bd Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Wed, 26 Oct 2016 12:05:55 +0300
Subject: drm/dp/mst: Check peer device type before attempting EDID read
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Ville Syrjälä <[email protected]>

commit 4da5caa6a6f82cda3193bca855235b87debf78bd upstream.

Only certain types of pdts have the DDC bus registered, so check for that before we attempt the EDID read. Othwewise we risk playing around with an i2c adapter that doesn't actually exist.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97666

---
 drivers/gpu/drm/drm_dp_mst_topology.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +3 -1
@@ -1155,7 +1155,9 @@ static void drm_dp_add_port(struct drm_d
 			drm_dp_put_port(port);
 			goto out;
 		}
-		if (port->port_num >= DP_MST_LOGICAL_PORT_0) {
+		if ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV ||
+		     port->pdt == DP_PEER_DEVICE_SST_SINK) &&
+		    port->port_num >= DP_MST_LOGICAL_PORT_0) {
 			port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
 			drm_mode_connector_set_tile_property(port->connector);
 		}

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/usb-gadget-function-u_ether-don-t-starve-tx-request-queue.patch queue-4.4/drm-i915-clean-up-ddi-ddc-aux-ch-sanitation.patch queue-4.4/drm-dp-mst-check-peer-device-type-before-attempting-edid-read.patch queue-4.4/drm-fb-helper-keep-references-for-the-current-set-of-used-connectors.patch queue-4.4/drm-dp-mst-clear-port-pdt-when-tearing-down-the-i2c-adapter.patch queue-4.4/drm-fb-helper-fix-connector-ref-leak-on-error.patch