From 6a80b25c62becf7929d47b2a983c8b02660f4487 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 17 Apr 2012 15:31:26 +0100
Subject: [PATCH] --- yaml --- r: 307187 b: refs/heads/master c:
 69963e7c76743bd9e8ef559f955165dd85d9ba72 h: refs/heads/master i:   307185:
 1bdf2eb14f5060fe2be8ed764ba8602372e6b271   307183:
 0145ca64f6bb5199525af464e6bc377fe617338c v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.h |  1 -
 trunk/drivers/gpu/drm/i915/i915_gem.c | 17 -----------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 0f061a7fddc0..b436b486e250 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a360bb1a83279243a0945a0e646fd6c66521864e
+refs/heads/master: 69963e7c76743bd9e8ef559f955165dd85d9ba72
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
index 016ebc9af802..6a504f997251 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.h
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -146,7 +146,6 @@ struct drm_i915_master_private {
 struct drm_i915_fence_reg {
 	struct list_head lru_list;
 	struct drm_i915_gem_object *obj;
-	uint32_t setup_seqno;
 	int pin_count;
 };
 
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 5a9d90f117d3..3a091f55fbcc 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2432,19 +2432,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
 			goto update;
 		}
 
-		if (reg->setup_seqno) {
-			if (!ring_passed_seqno(obj->last_fenced_ring,
-					       reg->setup_seqno)) {
-				ret = i915_wait_request(obj->last_fenced_ring,
-							reg->setup_seqno,
-							true);
-				if (ret)
-					return ret;
-			}
-
-			reg->setup_seqno = 0;
-		}
-
 		return 0;
 	}
 
@@ -2482,9 +2469,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
 	obj->fence_reg = reg - dev_priv->fence_regs;
 	obj->last_fenced_ring = NULL;
 
-	reg->setup_seqno = 0;
-	obj->last_fenced_seqno = reg->setup_seqno;
-
 update:
 	obj->tiling_changed = false;
 	switch (INTEL_INFO(dev)->gen) {
@@ -2543,7 +2527,6 @@ i915_gem_clear_fence_reg(struct drm_device *dev,
 
 	list_del_init(&reg->lru_list);
 	reg->obj = NULL;
-	reg->setup_seqno = 0;
 	reg->pin_count = 0;
 }