summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-05-21 00:32:02 -0700
committerEric Anholt <eric@anholt.net>2008-05-22 22:00:21 -0700
commitda3f099a7c4a18468ff84819ed39e42bec641e11 (patch)
tree02086a3933e10af6901821967dc637da9ca2d949
parent5e662f90d1143de53db866e2b8a94f1bfbe5fc51 (diff)
[intel-gem] invalidate ring locals for pin/unpin/set_domain/free functions
Ring locals must be reloaded from hardware in case the X server ran.
-rw-r--r--linux-core/i915_gem.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index c67ce309..469b613f 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -408,8 +408,6 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
ret = i915_wait_request(dev, obj_priv->last_rendering_seqno);
if (ret != 0)
return ret;
-
- BUG_ON(obj_priv->active);
}
return 0;