summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem_fence_reg.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
index 1ec1417cf8b4..65624b8e4d15 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
@@ -270,24 +270,16 @@ static int fence_update(struct drm_i915_fence_reg *fence,
return 0;
}
- ret = i915_reset_trylock(fence->i915);
- if (ret < 0)
- goto out_rpm;
-
+ WRITE_ONCE(fence->vma, vma);
fence_write(fence, vma);
- fence->vma = vma;
if (vma) {
vma->fence = fence;
list_move_tail(&fence->link, &fence->i915->mm.fence_list);
}
- i915_reset_unlock(fence->i915, ret);
- ret = 0;
-
-out_rpm:
intel_runtime_pm_put(fence->i915, wakeref);
- return ret;
+ return 0;
}
/**