From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 5/5] drm/i915: Clear the last_retired_context following a hang/reset
Date: Mon, 13 Feb 2017 12:55:02 +0200 [thread overview]
Message-ID: <87d1empdh5.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20170212172002.23072-5-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Following a hang and reset, we know that the engine is idle and all
> context state has been saved or lost. Consequently, we know that the
> engine is no longer referencing the last context and we can relinquish
> our tracking.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 730804ce9610..638b335e72b6 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2788,8 +2788,14 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
>
> i915_gem_retire_requests(dev_priv);
>
> - for_each_engine(engine, dev_priv, id)
> + for_each_engine(engine, dev_priv, id) {
> + struct i915_gem_context *ctx;
> +
> i915_gem_reset_engine(engine);
> + ctx = fetch_and_zero(&engine->last_retired_context);
> + if (ctx)
> + engine->context_unpin(engine, ctx);
> + }
>
> i915_gem_restore_fences(dev_priv);
>
> --
> 2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-02-13 10:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-12 17:19 [PATCH 1/5] drm/i915: Assert that the active request hasn't been signaled Chris Wilson
2017-02-12 17:19 ` [PATCH 2/5] drm/i915: Always call i915_gem_reset_finish() following i915_gem_reset_prepare() Chris Wilson
2017-02-13 10:22 ` Mika Kuoppala
2017-02-12 17:20 ` [PATCH 3/5] drm/i915: Kill the tasklet then disable Chris Wilson
2017-02-13 10:30 ` Mika Kuoppala
2017-02-12 17:20 ` [PATCH 4/5] drm/i915: Park the breadcrumbs signaler across a GPU reset Chris Wilson
2017-02-13 10:03 ` Mika Kuoppala
2017-02-13 10:16 ` Chris Wilson
2017-02-12 17:20 ` [PATCH 5/5] drm/i915: Clear the last_retired_context following a hang/reset Chris Wilson
2017-02-13 10:55 ` Mika Kuoppala [this message]
2017-02-13 11:25 ` Chris Wilson
2017-02-12 17:52 ` ✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915: Assert that the active request hasn't been signaled Patchwork
2017-02-13 9:38 ` [PATCH 1/5] " Chris Wilson
2017-02-13 10:52 ` ✓ Fi.CI.BAT: success for series starting with [1/5] " Patchwork
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=87d1empdh5.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