diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-09-12 10:29:33 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-09-12 12:59:46 +0100 |
| commit | a17592effdc16f3a51ef9c1dda30fe5c6d668263 (patch) | |
| tree | 6895b37f8f43b0fc62755bee52ff9159dfc30feb /drivers | |
| parent | 582a6f90aa0d9103ab834b3a48a5bb7e4d07cac6 (diff) | |
| download | lwn-a17592effdc16f3a51ef9c1dda30fe5c6d668263.tar.gz lwn-a17592effdc16f3a51ef9c1dda30fe5c6d668263.zip | |
drm/i915/execlists: Ensure the context is reloaded after a GPU reset
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>
Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190912092933.4729-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_lrc.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ out_replay: 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! */ mutex_release(&ce->pin_mutex.dep_map, 0, _THIS_IP_); unwind: |