Skip to contentSkip to conversation

Patch "drm/i915: Refresh that status of MST capable connectors in ->detect()" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 21, 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/i915: Refresh that status of MST capable connectors in ->detect()

to the 4.8-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-i915-refresh-that-status-of-mst-capable-connectors-in-detect.patch
and it can be found in the queue-4.8 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 fc22b787890f9f9067fd130feec42297a4ee62ba Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Fri, 21 Oct 2016 16:44:38 +0300
Subject: drm/i915: Refresh that status of MST capable connectors in ->detect()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

commit fc22b787890f9f9067fd130feec42297a4ee62ba upstream.

Once we've determined that the sink is MST capable we never end up running through the full detect cycle again, despite getting HPDs. Fix tht by ripping out the incorrect piece of code responsible.

This got broken when I moved the long HPD handling to the ->detect() hook, but failed to remove the leftover code.

Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rui Tiago Matos <[email protected]>

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

References: https://bugs.freedesktop.org/show_bug.cgi?id=98306

Fixes 1015811609c0 ("drm/i915: Move long hpd handling into the hotplug work")
(cherry picked from commit 1aab956c7b8872fb6976328316bfad62c6e67cf8)
---
 drivers/gpu/drm/i915/intel_dp.c |   10 ----------
 1 file changed, 10 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -10
@@ -4323,21 +4323,11 @@ static enum drm_connector_status
 intel_dp_detect(struct drm_connector *connector, bool force)
 {
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	struct intel_encoder *intel_encoder = &intel_dig_port->base;
 	enum drm_connector_status status = connector->status;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
-	if (intel_dp->is_mst) {
-		/* MST devices are disconnected from a monitor POV */
-		intel_dp_unset_edid(intel_dp);
-		if (intel_encoder->type != INTEL_OUTPUT_EDP)
-			intel_encoder->type = INTEL_OUTPUT_DP;
-		return connector_status_disconnected;
-	}
-
 	/* If full detect is not performed yet, do a full detect */
 	if (!intel_dp->detect_done)
 		status = intel_dp_long_pulse(intel_dp->attached_connector);

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

queue-4.8/drm-i915-refresh-that-status-of-mst-capable-connectors-in-detect.patch queue-4.8/drm-i915-assume-non-dp-port-if-dvo_port-is-hdmi-and-there-s-no-aux-ch-specified-in-the-vbt.patch