From: Chris Wilson Date: Thu, 21 Oct 2010 17:51:09 +0000 (+0100) Subject: drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b X-Git-Tag: v2.6.37-rc1~77^2~14^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c717966744e618af76aa5d7fe6cc44dba487bdc6;p=profile%2Fivi%2Fkernel-x86-ivi.git drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b In commit 8187a2b, the number of dwords used in the ringbuffer for executing the batch buffer was erroneously changed from 2 to 4. Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 89004a6..f1e0538 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -476,7 +476,7 @@ render_ring_dispatch_gem_execbuffer(struct drm_device *dev, intel_ring_emit(dev, ring, exec_start + exec_len - 4); intel_ring_emit(dev, ring, 0); } else { - intel_ring_begin(dev, ring, 4); + intel_ring_begin(dev, ring, 2); if (INTEL_INFO(dev)->gen >= 4) { intel_ring_emit(dev, ring, MI_BATCH_BUFFER_START | (2 << 6)