1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 68281c96c558..c8b9cc0cd0dc 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -1,13 +1,6 @@
 #ifndef _INTEL_RINGBUFFER_H_
 #define _INTEL_RINGBUFFER_H_
 
-enum {
-        RCS = 0x0,
-        VCS,
-        BCS,
-        I915_NUM_RINGS,
-};
-
 struct  intel_hw_status_page {
         u32     __iomem *page_addr;
         unsigned int    gfx_addr;
@@ -36,10 +29,11 @@ struct  intel_hw_status_page {
 struct  intel_ring_buffer {
         const char      *name;
         enum intel_ring_id {
-                RING_RENDER = 0x1,
-                RING_BSD = 0x2,
-                RING_BLT = 0x4,
+                RCS = 0x0,
+                VCS,
+                BCS,
         } id;
+#define I915_NUM_RINGS 3
         u32             mmio_base;
         void            __iomem *virtual_start;
         struct          drm_device *dev;
@@ -119,6 +113,12 @@ struct  intel_ring_buffer {
         void *private;
 };
 
+static inline unsigned
+intel_ring_flag(struct intel_ring_buffer *ring)
+{
+        return 1 << ring->id;
+}
+
 static inline u32
 intel_ring_sync_index(struct intel_ring_buffer *ring,
                       struct intel_ring_buffer *other)