aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-20 07:41:00 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-25 12:23:51 -0400
commite5f1d962a8e4c5fd6b3a8155c0f7a40b0bff4a96 (patch)
treeedf6cbe1e7259b2597ff140141d033723db33b73 /drivers/gpu/drm/i915/i915_gem.c
parent3bb73aba1ed5198a2c1dfaac4f3c95459930d84a (diff)
drm/i915: Remove assertion over write domain after i915_gem_object_sync()
As we move to lazily clearing the GPU write domain only when the buffer becomes inactive, this leaves a window of opportunity for i915_gem_object_pin_to_display_plane() to detect a seemingly inconsistent value. This function is special as it tries to pipeline the operation to avoid the stall and so may not retires the buffer and we may not get the opportunity to clear the write domain. However, we know all is good, so drop the assertion. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 771b8ba36e44..3bef7e60ddd6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3091,7 +3091,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
3091 /* It should now be out of any other write domains, and we can update 3091 /* It should now be out of any other write domains, and we can update
3092 * the domain values for our changes. 3092 * the domain values for our changes.
3093 */ 3093 */
3094 BUG_ON((obj->base.write_domain & ~I915_GEM_DOMAIN_GTT) != 0); 3094 obj->base.write_domain = 0;
3095 obj->base.read_domains |= I915_GEM_DOMAIN_GTT; 3095 obj->base.read_domains |= I915_GEM_DOMAIN_GTT;
3096 3096
3097 trace_i915_gem_object_change_domain(obj, 3097 trace_i915_gem_object_change_domain(obj,