aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-11 12:54:52 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-11 12:54:52 -0500
commit8168bd48bb863c00747497aadf13884b2d69d287 (patch)
tree17159818d70ec4e313d01b280f51be6afa70236f /drivers/gpu/drm/i915/i915_dma.c
parente74cfed521746544e6eeee84b24bd31c1e59ffe2 (diff)
drm/i915: Remove the definitions for Primary Ring Buffer
We only ever used the PRB0, neglecting the secondary ring buffers, and now with the advent of multiple engines with separate ring buffers we need to excise the anachronisms from our code (and be explicit about which ring we mean where). This is doubly important in light of the FORCEWAKE required to read ring buffer registers on SandyBridge. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 307bad0fcef7..4cd04917868d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -106,8 +106,8 @@ void i915_kernel_lost_context(struct drm_device * dev)
106 if (drm_core_check_feature(dev, DRIVER_MODESET)) 106 if (drm_core_check_feature(dev, DRIVER_MODESET))
107 return; 107 return;
108 108
109 ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR; 109 ring->head = I915_READ_HEAD(ring) & HEAD_ADDR;
110 ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR; 110 ring->tail = I915_READ_TAIL(ring) & TAIL_ADDR;
111 ring->space = ring->head - (ring->tail + 8); 111 ring->space = ring->head - (ring->tail + 8);
112 if (ring->space < 0) 112 if (ring->space < 0)
113 ring->space += ring->size; 113 ring->space += ring->size;