diff options
author | Ben Widawsky | 2013-12-06 23:11:03 +0100 |
---|---|---|
committer | Daniel Vetter | 2013-12-18 15:27:54 +0100 |
commit | acce9ffa4807027965ebd948456fa8385bbee32e (patch) | |
tree | efe25ea39ef963497042c4fb791e9aaf440fff62 /drivers/gpu/drm/i915/i915_gem.c | |
parent | drm/i915: Track which ring a context ran on (diff) | |
download | kernel-qcow2-linux-acce9ffa4807027965ebd948456fa8385bbee32e.tar.gz kernel-qcow2-linux-acce9ffa4807027965ebd948456fa8385bbee32e.tar.xz kernel-qcow2-linux-acce9ffa4807027965ebd948456fa8385bbee32e.zip |
drm/i915: Better reset handling for contexts
This patch adds to changes for contexts on reset:
Sets last context to default - this will prevent the context switch
happening after a reset. That switch is not possible because the
rings are hung during reset and context switch requires reset. This
behavior will need to be reworked in the future, but this is what we
want for now.
In the future, we'll also want to reset the guilty context to
uninitialized. We should wait for ARB_Robustness related code to land
for that.
This is somewhat for paranoia. Because we really don't know what the
GPU was doing when it hung, or the state it was in (mid context write,
for example), later restoring the context is a bad idea. By setting the
flag to not initialized, the next load of that context will not restore
the state, and thus on the subsequent switch away from the context will
overwrite the old data.
NOTE: This code needs a fixup when we actually have multiple VMs. The
issue that can occur is inactive objects in a VM will need to be
destroyed before the last context unref. This can now happen via the
fake switch introduced in this patch (and it other ways in the future)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 254f575b259c..fe17c62c7b09 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2412,6 +2412,8 @@ void i915_gem_reset(struct drm_device *dev) i915_gem_cleanup_ringbuffer(dev); + i915_gem_context_reset(dev); + i915_gem_restore_fences(dev); } |