Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915: Check for fused or unused pipes" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-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 9965db26ac0548648309f506dc155a92daa2158f Mon Sep 17 00:00:00 2001

From: Mika Kahola <[email protected]>
Date: Mon, 18 Dec 2017 10:04:03 +0200
Subject: [PATCH] drm/i915: Check for fused or unused pipes

We may have fused or unused pipes in our system. Let's check that the pipe in question is within limits of accessible pipes. In case, that we are not able to access the pipe, we return early with a warning.

v2: Rephrasing of the commit message (Jani)

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

drivers/gpu/drm/i915/intel_audio.c +1 -1
index f1502a0188eb..522d54fecb53 100644
@@ -779,7 +779,7 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
 {
 	struct intel_encoder *encoder;
 
-	if (WARN_ON(pipe >= INTEL_INFO(dev_priv)->num_pipes))
+	if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
 		return NULL;
 
 	/* MST */