Skip to contentSkip to conversation

Patch "drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 26, 2017

Subsystems (3)
Stable branch DRM drivers Intel i915
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: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()

to the 4.9-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-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch
and it can be found in the queue-4.9 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 b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Thu, 1 Jun 2017 17:36:14 +0300
Subject: drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

commit b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef upstream.

If intel_crtc_disable_noatomic() were to ever get called during resume we'd end up deadlocking since resume has its own acqcuire_ctx but intel_crtc_disable_noatomic() still tries to use the mode_config.acquire_ctx. Pass down the correct acquire ctx from the top.

Cc Maarten Lankhorst <[email protected]>
Fixes e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
Signed-off-by Ville Syrjälä <[email protected]>
Link http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by Maarten Lankhorst <[email protected]>
(cherry picked from commit da1d0e265535634bba80d44510b864c620549bee)
Signed-off-by Jani Nikula <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -4
@@ -6838,7 +6838,8 @@ static void i9xx_crtc_disable(struct int
 		intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
 }
 
-static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
+static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
+					struct drm_modeset_acquire_ctx *ctx)
 {
 	struct intel_encoder *encoder;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

@@ -6868,7 +6869,7 @@ static void intel_crtc_disable_noatomic(
 		return;
 	}
 
-	state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
+	state->acquire_ctx = ctx;
 
 	/* Everything's already locked, -EDEADLK can't happen. */
 	crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);

@@ -16607,7 +16608,7 @@ static void intel_sanitize_crtc(struct i
 		plane = crtc->plane;
 		to_intel_plane_state(crtc->base.primary->state)->base.visible = true;
 		crtc->plane = !plane;
-		intel_crtc_disable_noatomic(&crtc->base);
+		intel_crtc_disable_noatomic(&crtc->base, ctx);
 		crtc->plane = plane;
 	}
 

@@ -16623,7 +16624,7 @@ static void intel_sanitize_crtc(struct i
 	/* Adjust the state of the output pipe according to whether we
 	 * have active connectors/encoders. */
 	if (crtc->active && !intel_crtc_has_encoders(crtc))
-		intel_crtc_disable_noatomic(&crtc->base);
+		intel_crtc_disable_noatomic(&crtc->base, ctx);
 
 	if (crtc->active || HAS_GMCH_DISPLAY(dev)) {
 		/*

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

queue-4.9/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch