drm/i915: Consolidate i915_vma_unpin_and_release()

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

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 30b066140b0ce87443c8b2857d123749ed6c4a70..65ef172e876177e2d045ac388cb5b3b1d0e1bbba 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1257,14 +1257,8 @@ static int init_render_ring(struct intel_engine_cs *engine)
 static void render_ring_cleanup(struct intel_engine_cs *engine)
 {
        struct drm_i915_private *dev_priv = engine->i915;
-       struct i915_vma *vma;
-
-       vma = fetch_and_zero(&dev_priv->semaphore);
-       if (!vma)
-               return;
 
-       i915_vma_unpin(vma);
-       i915_vma_put(vma);
+       i915_vma_unpin_and_release(&dev_priv->semaphore);
 }
 
 static int gen8_rcs_signal(struct drm_i915_gem_request *req)