From da3f099a7c4a18468ff84819ed39e42bec641e11 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 21 May 2008 00:32:02 -0700
Subject: [PATCH] [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.
---
 linux-core/i915_gem.c | 2 --
 1 file changed, 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;