[PATCH 15/28] drm/i915: Add lock for unbinding to i915_gem_object_ggtt_pin_ww

[Maarten Lankhorst]

Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 981e383d1a5d..6aa9e465b48e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -931,7 +931,14 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object 
*obj,
                        goto new_vma;
                }
 
-               ret = i915_vma_unbind(vma);
+               ret = 0;
+               if (!ww)
+                       ret = i915_gem_object_lock_interruptible(obj, NULL);
+               if (!ret) {
+                       ret = i915_vma_unbind(vma);
+                       if (!ww)
+                               i915_gem_object_unlock(obj);
+               }
                if (ret)
                        return ERR_PTR(ret);
        }
-- 
2.33.0