[Intel-gfx] [PATCH] drm/i915: unlock mutex before intel_modeset_init_hw

Chris Wilson chris at chris-wilson.co.uk
Fri May 18 23:22:32 CEST 2012


On Fri, 18 May 2012 17:57:13 -0300, Paulo Zanoni <przanoni at gmail.com> wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
> 
> 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 <chris at chris-wilson.co.uk>
> 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.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

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

-- 
Chris Wilson, Intel Open Source Technology Centre



More information about the Intel-gfx mailing list