diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 13:51:09 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 13:51:09 -0400 |
commit | c717966744e618af76aa5d7fe6cc44dba487bdc6 (patch) | |
tree | ce5c9e7eb06895d4bc5721387533ace7539006f0 /drivers/gpu/drm | |
parent | b5dc608c98d929abbf2fe932ed07b3c868d83342 (diff) |
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
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 89004a622f49..f1e0538b21f5 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, | |||
476 | intel_ring_emit(dev, ring, exec_start + exec_len - 4); | 476 | intel_ring_emit(dev, ring, exec_start + exec_len - 4); |
477 | intel_ring_emit(dev, ring, 0); | 477 | intel_ring_emit(dev, ring, 0); |
478 | } else { | 478 | } else { |
479 | intel_ring_begin(dev, ring, 4); | 479 | intel_ring_begin(dev, ring, 2); |
480 | if (INTEL_INFO(dev)->gen >= 4) { | 480 | if (INTEL_INFO(dev)->gen >= 4) { |
481 | intel_ring_emit(dev, ring, | 481 | intel_ring_emit(dev, ring, |
482 | MI_BATCH_BUFFER_START | (2 << 6) | 482 | MI_BATCH_BUFFER_START | (2 << 6) |