From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kenneth Graunke <kenneth@whitecape.org>
Subject: Re: [PATCH] drm/i915: fix gen4 gpu reset
Date: Wed, 02 May 2012 12:54:46 -0700
Message-ID: <4FA19106.7020801@whitecape.org>
References: <87wr50rc31.fsf@eliezer.anholt.net>
	<1335987232-4786-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from homiemail-a60.g.dreamhost.com (caiajhbdcaid.dreamhost.com
	[208.97.132.83])
	by gabe.freedesktop.org (Postfix) with ESMTP id B662E9F0D8
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  2 May 2012 12:54:40 -0700 (PDT)
In-Reply-To: <1335987232-4786-1-git-send-email-daniel.vetter@ffwll.ch>
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On 05/02/2012 12:33 PM, Daniel Vetter wrote:
> While trying to fix up gen4 gpu reset in
>
> commit f49f0586191fe16140410db0a46d43bdc690d6af
> Author: Kenneth Graunke<kenneth@whitecape.org>
> Date:   Sat Sep 11 01:19:14 2010 -0700
>
>      drm/i915: Actually set the reset bit in i965_reset
>
> a little confusion about when wait_for times out has been introduced -
> wait for loops _until_ the condition is true.
>
> This fixes gpu reset on my gm45, testing with my hangman code shows
> that it's now fairly reliable - it only died after well over 100 reset
> cycles.
>
> Cc: Kenneth Graunke<kenneth@whitecape.org>
> Cc: Eric Anholt<eric@anholt.net>
> Signed-Off-by: Daniel Vetter<daniel.vetter@ffwll.ch>
> ---
>   drivers/gpu/drm/i915/i915_drv.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 133f101..77b7a50 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -707,7 +707,7 @@ static int i965_reset_complete(struct drm_device *dev)
>   {
>   	u8 gdrst;
>   	pci_read_config_byte(dev->pdev, I965_GDRST,&gdrst);
> -	return gdrst&  0x1;
> +	return (gdrst&  GRDOM_RESET_ENABLE) == 0;
>   }
>
>   static int i965_do_reset(struct drm_device *dev)

How embarassing :)  Ironlake also has the same bug and IIRC hasn't been 
resetting properly for me.  I can test that if you'd like.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

I might also Cc: stable@kernel.org an equivalent of this...but, up to you.