From 81cc19f4cd1317548f7b868166ff15f05a544fa8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 12 Jul 2011 18:03:29 +0100 Subject: [PATCH] --- yaml --- r: 254861 b: refs/heads/master c: a94919eaddaa3fede1df8563ce4d761a75374645 h: refs/heads/master i: 254859: f9d25f7a7033c41cc55a9922e8139e8b4037d5f9 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 83526c80e688..cf7fc4532f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05bd42688dbc066d4e2689b6f73c0470601f788b +refs/heads/master: a94919eaddaa3fede1df8563ce4d761a75374645 diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h index c0e0ee63fbf4..39ac2b634ae5 100644 --- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -165,7 +165,7 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring); int __must_check intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n); static inline int intel_wait_ring_idle(struct intel_ring_buffer *ring) { - return intel_wait_ring_buffer(ring, ring->space - 8); + return intel_wait_ring_buffer(ring, ring->size - 8); } int __must_check intel_ring_begin(struct intel_ring_buffer *ring, int n);