From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 09/15] drm/i915: Wake up waiters after setting the WEDGED bit
Date: Thu, 20 Jul 2017 16:48:26 +0300 [thread overview]
Message-ID: <87wp735idx.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20170717091141.23102-9-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> After setting the WEDGED bit, make sure that we do wake up waiters as
> they may not be waiting for a request completion yet, just for its
> execution.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 40e94b4ef532..ca7a56ff3904 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3157,10 +3157,12 @@ static int __i915_gem_set_wedged_BKL(void *data)
> struct intel_engine_cs *engine;
> enum intel_engine_id id;
>
> - set_bit(I915_WEDGED, &i915->gpu_error.flags);
> for_each_engine(engine, i915, id)
> engine_set_wedged(engine);
>
> + set_bit(I915_WEDGED, &i915->gpu_error.flags);
> + wake_up_all(&i915->gpu_error.reset_queue);
> +
> return 0;
> }
>
> --
> 2.13.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-07-20 13:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-17 9:11 [PATCH 01/15] drm/i915: Report execlists irq bit in debugfs Chris Wilson
2017-07-17 9:11 ` [PATCH 02/15] drm/i915: Reset context image on engines after triggering the reset Chris Wilson
2017-07-17 9:11 ` [PATCH 03/15] drm/i915: Serialize per-engine resets against new requests Chris Wilson
2017-07-17 21:58 ` Michel Thierry
2017-07-17 9:11 ` [PATCH 04/15] drm/i915: Flush the execlist ports if idle Chris Wilson
2017-07-20 12:18 ` Mika Kuoppala
2017-07-20 12:28 ` Chris Wilson
2017-07-20 13:12 ` Mika Kuoppala
2017-07-17 9:11 ` [PATCH 05/15] drm/i915: Check execlist/ring status during hangcheck Chris Wilson
2017-07-17 23:11 ` Michel Thierry
2017-07-17 9:11 ` [PATCH 06/15] drm/i915: Check the execlist queue for pending requests before declaring idle Chris Wilson
2017-07-20 12:23 ` Mika Kuoppala
2017-07-17 9:11 ` [PATCH 07/15] drm/i915: Move idle checks before intel_engine_init_global_seqno() Chris Wilson
2017-07-20 13:16 ` Mika Kuoppala
2017-07-17 9:11 ` [PATCH 08/15] drm/i915: Clear execlist port[] before updating seqno on wedging Chris Wilson
2017-07-20 13:31 ` Mika Kuoppala
2017-07-20 13:54 ` Chris Wilson
2017-07-20 14:14 ` Mika Kuoppala
2017-07-17 9:11 ` [PATCH 09/15] drm/i915: Wake up waiters after setting the WEDGED bit Chris Wilson
2017-07-20 13:48 ` Mika Kuoppala [this message]
2017-07-17 9:11 ` [PATCH 10/15] drm/i915: Assert that machine is wedged for nop_submit_request Chris Wilson
2017-07-18 0:15 ` Michel Thierry
2017-07-20 12:51 ` Chris Wilson
2017-07-20 17:10 ` Michel Thierry
2017-07-17 9:11 ` [PATCH 11/15] drm/i915: Clear engine irq posted following a reset Chris Wilson
2017-07-17 22:05 ` Michel Thierry
2017-07-17 9:11 ` [PATCH 12/15] drm/i915: Make i915_gem_context_mark_guilty() safe for unlocked updates Chris Wilson
2017-07-17 9:11 ` [PATCH 13/15] drm/i915: Emit a user level message when resetting the GPU (or engine) Chris Wilson
2017-07-18 0:22 ` Michel Thierry
2017-07-20 12:52 ` Chris Wilson
2017-07-17 9:11 ` [PATCH 14/15] drm/i915: Disable per-engine reset for Broxton Chris Wilson
2017-07-17 23:57 ` Michel Thierry
2017-07-17 9:11 ` [PATCH 15/15] drm/i915/selftests: Exercise independence of per-engine resets 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=87wp735idx.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;
as well as URLs for NNTP newsgroup(s).