summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2010-05-18 14:59:46 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2010-05-18 14:59:46 +0000
commit4badba7cab1e02b25910bc184a0cbcb638f74990 (patch)
tree0d049ad9768f2e521dad450449184d457d7738ed
parent119b604056fb372d02b8d4f678d0bd4b278f7695 (diff)
oops. needs_fence should still be conditional on tiling due to the needs
fence execbuffer logic.
-rw-r--r--sys/dev/pci/drm/i915_drv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index 18bbf48bb9a..dc28673ee97 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -2828,7 +2828,8 @@ i915_gem_object_pin_and_relocate(struct drm_obj *obj,
int i, ret, needs_fence;
DRM_ASSERT_HELD(obj);
- needs_fence = (entry->flags & EXEC_OBJECT_NEEDS_FENCE);
+ needs_fence = ((entry->flags & EXEC_OBJECT_NEEDS_FENCE) &&
+ obj_priv->tiling_mode != I915_TILING_NONE);
if (needs_fence)
atomic_setbits_int(&obj->do_flags, I915_EXEC_NEEDS_FENCE);