public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Move the final intel_gpu_reset() to after declaring wedged
Date: Mon, 12 Feb 2018 12:30:19 +0200	[thread overview]
Message-ID: <87k1viv6tg.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20180209114056.9957-1-chris@chris-wilson.co.uk>

Chris Wilson <chris@chris-wilson.co.uk> writes:

> If we fail to reset the GPU (i915_reset()), we do one final
> intel_gpu_reset() attempt as we mark the device wedged. The idea here is
> even though the GPU has proven unreliable (and so we want to stop using
> it for the time being), we don't want it spinning away in the background
> whilst the driver idles so we try to reset it one more time. However, we
> want to dump the i915_gem_set_wedged() debugging info before we do, so
> that we can see the accurate state of the GPU when it failed.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index cd57f946cf45..3ca3ce1e7359 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1920,7 +1920,6 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags)
>  	ret = i915_gem_reset_prepare(i915);
>  	if (ret) {
>  		dev_err(i915->drm.dev, "GPU recovery failed\n");
> -		intel_gpu_reset(i915, ALL_ENGINES);
>  		goto taint;
>  	}
>  
> @@ -2003,6 +2002,7 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags)
>  error:
>  	i915_gem_set_wedged(i915);
>  	i915_gem_retire_requests(i915);
> +	intel_gpu_reset(i915, ALL_ENGINES);
>  	goto finish;
>  }
>  
> -- 
> 2.16.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      parent reply	other threads:[~2018-02-12 10:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09 11:40 [PATCH] drm/i915: Move the final intel_gpu_reset() to after declaring wedged Chris Wilson
2018-02-09 15:31 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-02-09 16:17 ` ✓ Fi.CI.IGT: " Patchwork
2018-02-12 10:30 ` Mika Kuoppala [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k1viv6tg.fsf@gaia.fi.intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox