summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-01 14:57:56 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-01 14:57:56 +0100
commitae681d969ac0946e09636f2bef7a126d73e1ad6b (patch)
treedc26ce897c7b46a515665e6c56f11d1493f5bdb2 /drivers/gpu/drm/i915/i915_drv.h
parent2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9 (diff)
downloadlwn-ae681d969ac0946e09636f2bef7a126d73e1ad6b.tar.gz
lwn-ae681d969ac0946e09636f2bef7a126d73e1ad6b.zip
drm/i915: If the GPU hangs twice within 5 seconds, declare it wedged.
The issue is that we may become stuck executing a long running shader and continually attempt to reset the GPU. (Or maybe we tickle some bug and need to break the vicious cycle.) So if we are detect a second hang within 5 seconds, give up trying to programme the GPU and report it wedged. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d19a26af3f8e..73ad8bff2c2a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -699,6 +699,8 @@ typedef struct drm_i915_private {
struct drm_mm_node *compressed_fb;
struct drm_mm_node *compressed_llb;
+ unsigned long last_gpu_reset;
+
/* list of fbdev register on this device */
struct intel_fbdev *fbdev;
} drm_i915_private_t;