summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-02-23 15:26:30 +1100
committerJonathan Gray <jsg@jsg.id.au>2013-02-23 15:26:30 +1100
commitaf10d324461c5f817c82171bd8b4f14bebf0471c (patch)
treebaacd2ba3cc754be1dfacd386ccd3095618de675
parente01aa50c177ea1dc98c09763d2af597f0a68940f (diff)
don't call i915_gem_object_get_fence in i915_gem_process_flushing
seems to have never been there in the original linux code and is now causing problems. Diff from kettenis.
-rw-r--r--sys/dev/pci/drm/i915_drv.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index 2651ea1b882..5a914b5aff4 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -1254,17 +1254,6 @@ i915_gem_process_flushing(struct intel_ring_buffer *ring,
list_del_init(&obj_priv->gpu_write_list);
i915_gem_object_move_to_active(obj_priv, ring);
obj->write_domain = 0;
- /* if we still need the fence, update LRU */
- if (obj_priv->fenced_gpu_access) {
- KASSERT(obj_priv->fence_reg !=
- I915_FENCE_REG_NONE);
- /* we have a fence, won't sleep, can't fail
- * since we have the fence we no not need
- * to have the object held
- */
- i915_gem_object_get_fence(obj_priv);
- }
-
}
}
}