From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] drm/i915: unlock mutex before
 intel_modeset_init_hw
Date: Sat, 19 May 2012 22:40:37 +0200
Message-ID: <20120519204037.GA4738@phenom.ffwll.local>
References: <1337374633-4438-1-git-send-email-przanoni@gmail.com>
	<1337376154_107539@CP5-2952>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43])
	by gabe.freedesktop.org (Postfix) with ESMTP id 945A89F5B3
	for <intel-gfx@lists.freedesktop.org>;
	Sat, 19 May 2012 13:39:24 -0700 (PDT)
Received: by wgbdr1 with SMTP id dr1so3034770wgb.12
	for <intel-gfx@lists.freedesktop.org>;
	Sat, 19 May 2012 13:39:23 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1337376154_107539@CP5-2952>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

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@gmail.com> wrote:
> > From: Paulo Zanoni <paulo.r.zanoni@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@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@chris-wilson.co.uk>
> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@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@ffwll.ch
Mobile: +41 (0)79 365 57 48