From: Chris Wilson Date: Sun, 7 Nov 2010 11:45:52 +0000 (+0000) Subject: drm/i915/ringbuffer: Be consistent in use of ring->size when initialising X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4;p=linux-beck.git drm/i915/ringbuffer: Be consistent in use of ring->size when initialising Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 78a5061a58f6..9033697783b9 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -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 */