Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915: Make DP-MST connector info work" failed to apply to 4.13-stable tree

PATCH [email protected] 1 participant 1 message Sep 4, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.13-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 77d1f615c78a73a04254fa2bff07ee9fa27145d9 Mon Sep 17 00:00:00 2001

From: Maarten Lankhorst <[email protected]>
Date: Mon, 26 Jun 2017 10:33:49 +0200
Subject: [PATCH] drm/i915: Make DP-MST connector info work

Commit 9a148a96fc3a ("drm/i915/debugfs: add dp mst info") adds support for DP-MST to intel_connector_info, but forgot to remove the early return for DP-MST.

Remove it, and print out MST connectors directly.

Fixes 9a148a96fc3a ("drm/i915/debugfs: add dp mst info")
Cc <[email protected]> # v4.11+
Cc Dhinakaran Pandiyan <[email protected]>
Cc Libin Yang <[email protected]>
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
index ca2e34b1c798..620c9218d1c1 100644
@@ -3108,7 +3108,7 @@ static void intel_connector_info(struct seq_file *m,
 			   connector->display_info.cea_rev);
 	}
 
-	if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)
+	if (!intel_encoder)
 		return;
 
 	switch (connector->connector_type) {