diff options
| author | Ben Widawsky | 2016-09-20 15:54:32 +0200 |
|---|---|---|
| committer | Imre Deak | 2016-09-21 14:32:36 +0200 |
| commit | d636951ec01bcb2b7dee02f75ff4815714785a53 (patch) | |
| tree | ddccc5b2b934a716791284423861a49715d86128 /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | drm/i915: Unlock PPS registers after GPU reset (diff) | |
| download | kernel-qcow2-linux-d636951ec01bcb2b7dee02f75ff4815714785a53.tar.gz kernel-qcow2-linux-d636951ec01bcb2b7dee02f75ff4815714785a53.tar.xz kernel-qcow2-linux-d636951ec01bcb2b7dee02f75ff4815714785a53.zip | |
drm/i915: Cleanup instdone collection
Consolidate the instdone logic so we can get a bit fancier. This patch also
removes the duplicated print of INSTDONE[0].
v2: (Imre)
- Rebased on top of hangcheck INSTDONE changes.
- Move all INSTDONE registers into a single struct, store it within the
engine error struct during error capturing.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474379673-28326-1-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 7f64d611159b..4ff47023e68d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -73,13 +73,21 @@ enum intel_engine_hangcheck_action { #define HANGCHECK_SCORE_RING_HUNG 31 +struct intel_instdone { + u32 instdone; + /* The following exist only in the RCS engine */ + u32 slice_common; + u32 sampler; + u32 row; +}; + struct intel_engine_hangcheck { u64 acthd; u32 seqno; int score; enum intel_engine_hangcheck_action action; int deadlock; - u32 instdone[I915_NUM_INSTDONE_REG]; + struct intel_instdone instdone; }; struct intel_ring { |