From d29f3e7d0b3bfe38ef096244ce7190c53c3aa644 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 7 Nov 2010 11:45:52 +0000 Subject: [PATCH] --- yaml --- r: 228695 b: refs/heads/master c: ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4 h: refs/heads/master i: 228693: 4d3888790e837b86b85755daba5c9472868a6f83 228691: 82c1626d1a7af6b5b0169d42fb5b2d3ef59e5960 228687: 7eec323e0d5966d33fbb18fae95a49aa94951a38 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf0e79c9ed3a..11b3b1bcdf27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 045e769ab69ce94dedbcdcfd46c2578b385c2986 +refs/heads/master: ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4 diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c index 78a5061a58f6..9033697783b9 100644 --- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/trunk/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 */