drm/i915: Consolidate i915_vma_unpin_and_release()

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_engine_cs.c

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 573f642a74f80394d4dd2e3b069e7b7670b2c621..f02d66bbec4b049bdda484e4ead556e77015dc39 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -279,14 +279,7 @@ err_unref:
 
 static void intel_engine_cleanup_scratch(struct intel_engine_cs *engine)
 {
-       struct i915_vma *vma;
-
-       vma = fetch_and_zero(&engine->scratch);
-       if (!vma)
-               return;
-
-       i915_vma_unpin(vma);
-       i915_vma_put(vma);
+       i915_vma_unpin_and_release(&engine->scratch);
 }
 
 /**