diff options
| author | Chris Wilson | 2010-06-06 13:16:24 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-08-02 04:03:46 +0200 |
| commit | cbb465e72ae2cf37d252284c28a0d89ddfaaa240 (patch) | |
| tree | 4ea7d5ba990ca20ebb768b2993ca70e37c56b157 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: Remove the WARN when failing to set tiling. (diff) | |
| download | kernel-qcow2-linux-cbb465e72ae2cf37d252284c28a0d89ddfaaa240.tar.gz kernel-qcow2-linux-cbb465e72ae2cf37d252284c28a0d89ddfaaa240.tar.xz kernel-qcow2-linux-cbb465e72ae2cf37d252284c28a0d89ddfaaa240.zip | |
drm/i915: Include instdone[1] in hangcheck
References:
Bug 26691 - Spurious hangcheck whilst executing a long shader over a
large vertex buffer
https://bugs.freedesktop.org/show_bug.cgi?id=26691
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
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 21a4af999191..70e252768ab3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -286,6 +286,8 @@ typedef struct drm_i915_private { struct timer_list hangcheck_timer; int hangcheck_count; uint32_t last_acthd; + uint32_t last_instdone; + uint32_t last_instdone1; struct drm_mm vram; |