move i915_gem_object_wait_rendering a bit closer to 3.4.33

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c
index afa13f7635e..a495cca79c4 100644
--- a/sys/dev/pci/drm/i915_gem.c
+++ b/sys/dev/pci/drm/i915_gem.c
@@ -471,11 +471,11 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,
 	if (seqno == 0)
 		return 0;
 
-	ret = i915_wait_seqno(ring, seqno);
-	if (ret)
-		return ret;
-
-	i915_gem_retire_requests_ring(ring);
+	if (obj->active) {
+		ret = i915_wait_seqno(ring, seqno);
+		if (ret)
+			return ret;
+	}
 
 	/* Manually manage the write flush as we may have not yet
 	 * retired the buffer.