]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/ringbuffer: Be consistent in use of ring->size when initialising
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 7 Nov 2010 11:45:52 +0000 (11:45 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 7 Nov 2010 11:45:52 +0000 (11:45 +0000)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_ringbuffer.c

index 78a5061a58f6b8213ece8eb8a8f21a1f8b846a7e..9033697783b990af71a02f43ebb1e4f3a9c6b04e 100644 (file)
@@ -173,7 +173,7 @@ static int init_ring_common(struct intel_ring_buffer *ring)
        }
 
        I915_WRITE_CTL(ring,
-                       ((ring->gem_object->size - PAGE_SIZE) & RING_NR_PAGES)
+                       ((ring->size - PAGE_SIZE) & RING_NR_PAGES)
                        | RING_REPORT_64K | RING_VALID);
 
        /* If the head is still not zero, the ring is dead */