---

yaml --- r: 217912 b: refs/heads/master c: 4fc6ee7 h: refs/heads/master v: v3
git-mirror · Sep 8, 2010 · 0921174 · 0921174
1 parent a5fc4e0
commit 0921174
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba3d8d749b01548b918519a49024341d8dc9e71c
+refs/heads/master: 4fc6ee764620eb3a9364e736d03605d4b233ea61
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2043,7 +2043,6 @@ i915_gpu_idle(struct drm_device *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	bool lists_empty;
-	uint32_t seqno1, seqno2;
 	int ret;
 
 	spin_lock(&dev_priv->mm.active_list_lock);
@@ -2058,18 +2057,17 @@ i915_gpu_idle(struct drm_device *dev)
 
 	/* Flush everything onto the inactive list. */
 	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);
-	seqno1 = i915_add_request(dev, NULL, &dev_priv->render_ring);
-	if (seqno1 == 0)
-		return -ENOMEM;
-	ret = i915_wait_request(dev, seqno1, &dev_priv->render_ring);
+
+	ret = i915_wait_request(dev,
+				i915_gem_next_request_seqno(dev, &dev_priv->render_ring),
+				&dev_priv->render_ring);
 	if (ret)
 		return ret;
 
 	if (HAS_BSD(dev)) {
-		seqno2 = i915_add_request(dev, NULL, &dev_priv->bsd_ring);
-		if (seqno2 == 0)
-			return -ENOMEM;
-		ret = i915_wait_request(dev, seqno2, &dev_priv->bsd_ring);
+		ret = i915_wait_request(dev,
+					i915_gem_next_request_seqno(dev, &dev_priv->bsd_ring),
+					&dev_priv->bsd_ring);
 		if (ret)
 			return ret;
 	}