From ad172d79d182da40847b6a5b1514c2593eaee198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 18 Apr 2007 19:35:58 +0200 Subject: [PATCH] i915: Don't always read/write LP_RING register in generalized ring functions. --- shared-core/i915_dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 4237b565..6b67433d 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -45,11 +45,11 @@ int i915_wait_ring(drm_i915_private_t *dev_priv, drm_i915_ring_buffer_t *ring, int n, const char *caller) { - u32 last_head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR; + u32 last_head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR; int i; for (i = 0; i < 10000; i++) { - ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR; + ring->head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR; ring->space = ring->head - (ring->tail + 8); if (ring->space < 0) ring->space += ring->Size; @@ -71,8 +71,8 @@ int i915_wait_ring(drm_i915_private_t *dev_priv, drm_i915_ring_buffer_t *ring, void i915_kernel_lost_context(drm_i915_private_t * dev_priv, drm_i915_ring_buffer_t *ring) { - ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR; - ring->tail = I915_READ(LP_RING + RING_TAIL) & TAIL_ADDR; + ring->head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR; + ring->tail = I915_READ(ring->reg + RING_TAIL) & TAIL_ADDR; ring->space = ring->head - (ring->tail + 8); if (ring->space < 0) ring->space += ring->Size;