From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/5] drm/i915: Suppress EIO during i915_gem_idle()
Date: Wed, 18 Apr 2012 10:51:29 +0200 [thread overview]
Message-ID: <20120418085129.GE5315@phenom.ffwll.local> (raw)
In-Reply-To: <1334393751-8921-3-git-send-email-chris@chris-wilson.co.uk>
On Sat, Apr 14, 2012 at 09:55:49AM +0100, Chris Wilson wrote:
> i915_gem_idle() is called when we need to suspend the GPU. If the GPU is
> already suspended by this point due to being wedged, we can safely
> continue.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Imo the right way to fix this case here is by checking this in gpu_idle
and just not bothering to emit any flushes and request if the gpu is
wedged already.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index ffe0853..a6819c1 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3576,7 +3576,7 @@ i915_gem_idle(struct drm_device *dev)
> }
>
> ret = i915_gpu_idle(dev, true);
> - if (ret) {
> + if (ret && ret != -EIO) {
> mutex_unlock(&dev->struct_mutex);
> return ret;
> }
> --
> 1.7.10
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
next prev parent reply other threads:[~2012-04-18 8:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-14 8:55 [PATCH 1/5] drm/i915: Suppress EIO during set-to-gtt Chris Wilson
2012-04-14 8:55 ` [PATCH 2/5] drm/i915: Suppress EIO through fence-flushing Chris Wilson
2012-04-14 9:02 ` Chris Wilson
2012-04-14 8:55 ` [PATCH 3/5] drm/i915: Suppress EIO during i915_gem_idle() Chris Wilson
2012-04-18 8:51 ` Daniel Vetter [this message]
2012-04-18 9:03 ` Chris Wilson
2012-04-14 8:55 ` [PATCH 4/5] drm/i915: Always flush tiling changes before accessing through the GTT Chris Wilson
2012-04-14 21:54 ` Daniel Vetter
2012-04-14 21:59 ` Chris Wilson
2012-04-14 8:55 ` [PATCH 5/5] " Chris Wilson
2012-04-14 22:00 ` Daniel Vetter
2012-04-18 8:48 ` Daniel Vetter
2012-04-14 9:02 ` [PATCH 1/5] drm/i915: Suppress EIO during set-to-gtt Chris Wilson
2012-04-18 9:03 ` Daniel Vetter
2012-04-18 9:10 ` Chris Wilson
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=20120418085129.GE5315@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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