Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4da5caa6 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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



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.

Cc: stable@vger.kernel.org
Cc: Carlos Santa <carlos.santa@intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Tested-by: default avatarCarlos Santa <carlos.santa@intel.com>
Tested-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97666


Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1477472755-15288-5-git-send-email-ville.syrjala@linux.intel.com
parent 36e3fa6a

drivers/gpu/drm/drm_dp_mst_topology.c

+3 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,9 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, 
			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);

		}