Commit 6c0e1c55 authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson

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

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 870e86dd
......@@ -157,7 +157,7 @@ static int init_ring_common(struct drm_device *dev,
ring->set_tail(dev, ring, 0);
/* Initialize the ring. */
I915_WRITE(ring->regs.start, obj_priv->gtt_offset);
I915_WRITE_START(ring, obj_priv->gtt_offset);
head = ring->get_head(dev, ring);
/* G45 ring initialization fails to reset head to zero */
......@@ -168,7 +168,7 @@ static int init_ring_common(struct drm_device *dev,
I915_READ(ring->regs.ctl),
I915_READ(ring->regs.head),
I915_READ_TAIL(ring),
I915_READ(ring->regs.start));
I915_READ_START(ring));
I915_WRITE(ring->regs.head, 0);
......@@ -178,7 +178,7 @@ static int init_ring_common(struct drm_device *dev,
I915_READ(ring->regs.ctl),
I915_READ(ring->regs.head),
I915_READ_TAIL(ring),
I915_READ(ring->regs.start));
I915_READ_START(ring));
}
I915_WRITE(ring->regs.ctl,
......@@ -194,7 +194,7 @@ static int init_ring_common(struct drm_device *dev,
I915_READ(ring->regs.ctl),
I915_READ(ring->regs.head),
I915_READ_TAIL(ring),
I915_READ(ring->regs.start));
I915_READ_START(ring));
return -EIO;
}
......@@ -781,7 +781,6 @@ static const struct intel_ring_buffer render_ring = {
.regs = {
.ctl = PRB0_CTL,
.head = PRB0_HEAD,
.start = PRB0_START
},
.mmio_base = RENDER_RING_BASE,
.size = 32 * PAGE_SIZE,
......@@ -818,7 +817,6 @@ static const struct intel_ring_buffer bsd_ring = {
.regs = {
.ctl = BSD_RING_CTL,
.head = BSD_RING_HEAD,
.start = BSD_RING_START
},
.mmio_base = BSD_RING_BASE,
.size = 32 * PAGE_SIZE,
......@@ -929,7 +927,6 @@ static const struct intel_ring_buffer gen6_bsd_ring = {
.regs = {
.ctl = GEN6_BSD_RING_CTL,
.head = GEN6_BSD_RING_HEAD,
.start = GEN6_BSD_RING_START
},
.mmio_base = GEN6_BSD_RING_BASE,
.size = 32 * PAGE_SIZE,
......
......@@ -9,6 +9,8 @@ struct intel_hw_status_page {
#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)
#define I915_READ_START(ring) I915_READ(RING_START(ring->mmio_base))
#define I915_WRITE_START(ring, val) I915_WRITE(RING_START(ring->mmio_base), val)
struct drm_i915_gem_execbuffer2;
struct intel_ring_buffer {
......@@ -20,7 +22,6 @@ struct intel_ring_buffer {
struct ring_regs {
u32 ctl;
u32 head;
u32 start;
} regs;
u32 mmio_base;
unsigned long size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment