From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: unlock mutex before intel_modeset_init_hw Date: Fri, 18 May 2012 22:22:32 +0100 Message-ID: <1337376154_107539@CP5-2952> References: <1337374633-4438-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id B15B99E7E1 for ; Fri, 18 May 2012 14:22:43 -0700 (PDT) In-Reply-To: <1337374633-4438-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Paulo Zanoni , intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, 18 May 2012 17:57:13 -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > > 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 > 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 > Signed-off-by: Paulo Zanoni 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