aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-21 18:51:09 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-21 18:51:09 +0100
commitc717966744e618af76aa5d7fe6cc44dba487bdc6 (patch)
treece5c9e7eb06895d4bc5721387533ace7539006f0 /drivers
parentb5dc608c98d929abbf2fe932ed07b3c868d83342 (diff)
downloadkernel_samsung_crespo-c717966744e618af76aa5d7fe6cc44dba487bdc6.zip
kernel_samsung_crespo-c717966744e618af76aa5d7fe6cc44dba487bdc6.tar.gz
kernel_samsung_crespo-c717966744e618af76aa5d7fe6cc44dba487bdc6.tar.bz2
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')
-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 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)