On Fri, May 18, 2012 at 10:22:32PM +0100, Chris Wilson wrote: > 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? :) History rectified, thanks for the fix. -Daniel -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48
