diff options
| author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2013-05-24 17:16:07 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-05-31 20:53:54 +0200 |
| commit | 92cab7345131db7af18f630a799ce6b2e8e624c5 (patch) | |
| tree | d61c1ac94941db3bdcbbae8753a2864557ed0b67 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 79ee20dc85072b0edfb5e461799d192a9cc9d422 (diff) | |
| download | op-kernel-dev-92cab7345131db7af18f630a799ce6b2e8e624c5.zip op-kernel-dev-92cab7345131db7af18f630a799ce6b2e8e624c5.tar.gz | |
drm/i915: track ring progression using seqnos
Instead of relying in acthd, track ring seqno progression
to detect if ring has hung.
v2: put hangcheck stuff inside struct (Chris Wilson)
v3: initialize hangcheck.seqno (Ben Widawsky)
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e09c54c..e417049 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -842,8 +842,6 @@ struct i915_gpu_error { #define DRM_I915_HANGCHECK_JIFFIES msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD) struct timer_list hangcheck_timer; int hangcheck_count; - uint32_t last_acthd[I915_NUM_RINGS]; - uint32_t prev_instdone[I915_NUM_INSTDONE_REG]; /* For reset and error_state handling. */ spinlock_t lock; |
