drm/i915: use new macros to access the ring tail register

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 3917d8b1c1a..2dfcd9bad3c 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -7,6 +7,9 @@ struct  intel_hw_status_page {
         struct          drm_gem_object *obj;
 };
 
+#define I915_READ_TAIL(ring) I915_READ(RING_TAIL(ring->mmio_base))
+#define I915_WRITE_TAIL(ring, val) I915_WRITE(RING_TAIL(ring->mmio_base), val)
+
 struct drm_i915_gem_execbuffer2;
 struct  intel_ring_buffer {
         const char      *name;
@@ -17,7 +20,6 @@ struct  intel_ring_buffer {
         struct          ring_regs {
                         u32 ctl;
                         u32 head;
-                        u32 tail;
                         u32 start;
         } regs;
         u32             mmio_base;
@@ -47,10 +49,9 @@ struct  intel_ring_buffer {
 
         unsigned int    (*get_head)(struct drm_device *dev,
                         struct intel_ring_buffer *ring);
-        unsigned int    (*get_tail)(struct drm_device *dev,
-                        struct intel_ring_buffer *ring);
         void            (*set_tail)(struct drm_device *dev,
-                        u32 value);
+                                    struct intel_ring_buffer *ring,
+                                    u32 value);
         unsigned int    (*get_active_head)(struct drm_device *dev,
                         struct intel_ring_buffer *ring);
         void            (*flush)(struct drm_device *dev,