aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-07 11:45:52 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-07 11:45:52 +0000
commitae69b42a10dafe61adb016e0e52ec1e8d1ba11b4 (patch)
treeb43bc5338d77cc378d5477937bc5c862b60bf498 /drivers/gpu/drm/i915/intel_ringbuffer.c
parent045e769ab69ce94dedbcdcfd46c2578b385c2986 (diff)
downloadkernel_samsung_smdk4412-ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4.zip
kernel_samsung_smdk4412-ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4.tar.gz
kernel_samsung_smdk4412-ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4.tar.bz2
drm/i915/ringbuffer: Be consistent in use of ring->size when initialising
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 78a5061..9033697 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 */