aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c17
1 files changed, 0 insertions, 17 deletions
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)
2432 goto update; 2432 goto update;
2433 } 2433 }
2434 2434
2435 if (reg->setup_seqno) {
2436 if (!ring_passed_seqno(obj->last_fenced_ring,
2437 reg->setup_seqno)) {
2438 ret = i915_wait_request(obj->last_fenced_ring,
2439 reg->setup_seqno,
2440 true);
2441 if (ret)
2442 return ret;
2443 }
2444
2445 reg->setup_seqno = 0;
2446 }
2447
2448 return 0; 2435 return 0;
2449 } 2436 }
2450 2437
@@ -2482,9 +2469,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
2482 obj->fence_reg = reg - dev_priv->fence_regs; 2469 obj->fence_reg = reg - dev_priv->fence_regs;
2483 obj->last_fenced_ring = NULL; 2470 obj->last_fenced_ring = NULL;
2484 2471
2485 reg->setup_seqno = 0;
2486 obj->last_fenced_seqno = reg->setup_seqno;
2487
2488update: 2472update:
2489 obj->tiling_changed = false; 2473 obj->tiling_changed = false;
2490 switch (INTEL_INFO(dev)->gen) { 2474 switch (INTEL_INFO(dev)->gen) {
@@ -2543,7 +2527,6 @@ i915_gem_clear_fence_reg(struct drm_device *dev,
2543 2527
2544 list_del_init(&reg->lru_list); 2528 list_del_init(&reg->lru_list);
2545 reg->obj = NULL; 2529 reg->obj = NULL;
2546 reg->setup_seqno = 0;
2547 reg->pin_count = 0; 2530 reg->pin_count = 0;
2548} 2531}
2549 2532