From da5645798f50466d8332a6384e91fbec8f1cc1c9 Mon Sep 17 00:00:00 2001
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date: Wed, 19 Dec 2012 11:13:07 +0200
Subject: [PATCH] --- yaml --- r: 357935 b: refs/heads/master c:
 ba1a7067c00f4cbdd99b00a570ff072639ae59f2 h: refs/heads/master i:   357933:
 75ec897c4fe8613a257f2e6d8d883a3db2f8e188   357931:
 b42987dfd9bab20177ac5f11508580e730deac19   357927:
 f9e3f07380f4ad91ac8e454c6b84a4e94d93b257   357919:
 1d779c8ae6ea01c09968344dc522d01fba089dc4 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 812886816ec4..e8f1b467892f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e98ad4d4a8afa043126a6f24d0a154a684e081
+refs/heads/master: ba1a7067c00f4cbdd99b00a570ff072639ae59f2
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 51282b2c4943..bb38bca02559 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1932,18 +1932,6 @@ i915_gem_handle_seqno_wrap(struct drm_device *dev)
 	struct intel_ring_buffer *ring;
 	int ret, i, j;
 
-	/* The hardware uses various monotonic 32-bit counters, if we
-	 * detect that they will wraparound we need to idle the GPU
-	 * and reset those counters.
-	 */
-	ret = 0;
-	for_each_ring(ring, dev_priv, i) {
-		for (j = 0; j < ARRAY_SIZE(ring->sync_seqno); j++)
-			ret |= ring->sync_seqno[j] != 0;
-	}
-	if (ret == 0)
-		return ret;
-
 	/* Carefully retire all requests without writing to the rings */
 	for_each_ring(ring, dev_priv, i) {
 		ret = intel_ring_idle(ring);