Skip to contentSkip to conversation

drm/i915: unlock mutex before intel_modeset_init_hw

PATCH In review Paulo Zanoni 3 participants 3 messages May 18, 2012 – May 19, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: unlock mutex before intel_modeset_init_hw

From: Paulo Zanoni <[email protected]>

Because on IVB, intel_modeset_init_hw calls gen6_enable_rps with locks the mutex. This problem broke suspend on my machine. It was introduced in the following commit:

commit 2e1352cf196094f44e73776f41087f4c489ab936

Author: Chris Wilson <[email protected]>
Date:   Wed May 9 11:56:28 2012 +0100

drm/i915: gen6_enable_rps() wants to be called after ring initialisation

This fix was actually suggested by Chris Wilson on a conversation, so the credit goes to him. I just bisected the problem, reported to him and tested his idea.

---
 drivers/gpu/drm/i915/i915_drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 3947804..d3e1948 100644
@@ -638,9 +638,9 @@ static int i915_drm_thaw(struct drm_device *dev)
 		dev_priv->mm.suspended = 0;
 
 		error = i915_gem_init_hw(dev);
-		intel_modeset_init_hw(dev);
 		mutex_unlock(&dev->struct_mutex);
 
+		intel_modeset_init_hw(dev);
 		drm_mode_config_reset(dev);
 		drm_irq_install(dev);
 
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 10 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Because on IVB, intel_modeset_init_hw calls gen6_enable_rps with locks the mutex. This problem broke suspend on my machine. It was introduced in the following commit:

commit 2e1352cf196094f44e73776f41087f4c489ab936

Author: Chris Wilson <[email protected]>
Date:   Wed May 9 11:56:28 2012 +0100
Quoted 8 lines

drm/i915: gen6_enable_rps() wants to be called after ring initialisation

This fix was actually suggested by Chris Wilson on a conversation, so the credit goes to him. I just bisected the problem, reported to him and tested his idea.

My mistake, I thought I was being consistent with the other callsites, when in fact it was the exact opposite.

Daniel, do you mind erasing the mistake from history and crediting Paulo for v3? :)
-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#2 lore raw
Quoted 17 lines · Chris Wilson
Quoted 16 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Because on IVB, intel_modeset_init_hw calls gen6_enable_rps with locks the mutex. This problem broke suspend on my machine. It was introduced in the following commit:

commit 2e1352cf196094f44e73776f41087f4c489ab936

Author: Chris Wilson <[email protected]>
Date:   Wed May 9 11:56:28 2012 +0100

drm/i915: gen6_enable_rps() wants to be called after ring initialisation

This fix was actually suggested by Chris Wilson on a conversation, so the credit goes to him. I just bisected the problem, reported to him and tested his idea.

Quoted 8 lines
Quoted 2 lines

My mistake, I thought I was being consistent with the other callsites, when in fact it was the exact opposite.

Daniel, do you mind erasing the mistake from history and crediting Paulo for v3? :)

History rectified, thanks for the fix.
-Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48