diff options
| author | Jani Nikula | 2013-08-11 11:44:01 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-08-22 13:31:37 +0200 |
| commit | f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7 (patch) | |
| tree | 713b6905bdcdc6fd1fed0356ab74e9bdf54d88a4 /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | drm/i915: remove unused leftover variable irq_received (diff) | |
| download | kernel-qcow2-linux-f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7.tar.gz kernel-qcow2-linux-f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7.tar.xz kernel-qcow2-linux-f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7.zip | |
drm/i915: give more distinctive names to ring hangcheck action enums
The short lowercase names are bound to collide. The default warnings
don't even warn about shadowing.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 6e38256d41e1..5e6be842d225 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -37,7 +37,12 @@ struct intel_hw_status_page { #define I915_READ_SYNC_0(ring) I915_READ(RING_SYNC_0((ring)->mmio_base)) #define I915_READ_SYNC_1(ring) I915_READ(RING_SYNC_1((ring)->mmio_base)) -enum intel_ring_hangcheck_action { wait, active, kick, hung }; +enum intel_ring_hangcheck_action { + HANGCHECK_WAIT, + HANGCHECK_ACTIVE, + HANGCHECK_KICK, + HANGCHECK_HUNG, +}; struct intel_ring_hangcheck { bool deadlock; |