2 files changed, 0 insertions, 18 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 016ebc9af802..6a504f997251 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/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/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5a9d90f117d3..3a091f55fbcc 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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;
 }