From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915/execlists: Ensure the context is reloaded after a GPU reset
Date: Thu, 12 Sep 2019 14:53:01 +0300 [thread overview]
Message-ID: <87impxspcy.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20190912092933.4729-2-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> After we manipulate the context to allow replay after a GPU reset, force
> that context to be reloaded. This should be a layer of paranoia, for if
> the GPU was reset, the context will no longer be resident!
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index dbc90da2341a..47d766ccea71 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -2445,6 +2445,7 @@ static void __execlists_reset(struct intel_engine_cs *engine, bool stalled)
> intel_ring_update_space(ce->ring);
> __execlists_reset_reg_state(ce, engine);
> __execlists_update_reg_state(ce, engine);
> + ce->lrc_desc |= CTX_DESC_FORCE_RESTORE; /* paranoid: GPU was
> reset! */
The CCID should be reset also, but I see no harm to be explicit.
Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> mutex_release(&ce->pin_mutex.dep_map, 0, _THIS_IP_);
>
> unwind:
> --
> 2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-09-12 11:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 9:29 [PATCH 1/2] drm/i915/execlists: Add a paranoid flush of the CSB pointers upon reset Chris Wilson
2019-09-12 9:29 ` [PATCH 2/2] drm/i915/execlists: Ensure the context is reloaded after a GPU reset Chris Wilson
2019-09-12 11:53 ` Mika Kuoppala [this message]
2019-09-12 11:59 ` Chris Wilson
2019-09-12 10:29 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/execlists: Add a paranoid flush of the CSB pointers upon reset Patchwork
2019-09-12 10:51 ` ✓ Fi.CI.BAT: success " Patchwork
2019-09-12 18:31 ` ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-09-12 7:09 [PATCH 1/2] " Chris Wilson
2019-09-12 7:09 ` [PATCH 2/2] drm/i915/execlists: Ensure the context is reloaded after a GPU reset 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=87impxspcy.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.