aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_execbuffer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-02 09:42:56 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-12-02 10:00:15 +0000
commit87ca9c8a7ea9c8c7ce1561edaad1aa8570f1a01e (patch)
tree727e90b080110273a51dc629c0db6ac482a69489 /drivers/gpu/drm/i915/i915_gem_execbuffer.c
parent257e48f1474a1f5bfa6fcafb12f77a8479063293 (diff)
downloadkernel_samsung_smdk4412-87ca9c8a7ea9c8c7ce1561edaad1aa8570f1a01e.zip
kernel_samsung_smdk4412-87ca9c8a7ea9c8c7ce1561edaad1aa8570f1a01e.tar.gz
kernel_samsung_smdk4412-87ca9c8a7ea9c8c7ce1561edaad1aa8570f1a01e.tar.bz2
drm/i915: Prevent stalling for a GTT read back from a read-only GPU target
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f57536a..af01a58 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -775,6 +775,7 @@ i915_gem_execbuffer_move_to_active(struct list_head *objects,
i915_gem_object_move_to_active(obj, ring);
if (obj->base.write_domain) {
obj->dirty = 1;
+ obj->pending_gpu_write = true;
list_move_tail(&obj->gpu_write_list,
&ring->gpu_write_list);
intel_mark_busy(ring->dev, obj);