[Intel-gfx] [PATCH 23/23] drm/i915: Ensure we hold the pin mutex

[Maarten Lankhorst]

Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +-
 drivers/gpu/drm/i915/i915_vma.c             | 9 ++++++++-
 drivers/gpu/drm/i915/i915_vma.h             | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_renderstate.c 
b/drivers/gpu/drm/i915/gt/intel_renderstate.c
index 86a5a8ba4f80..bee35fd5a015 100644
--- a/drivers/gpu/drm/i915/gt/intel_renderstate.c
+++ b/drivers/gpu/drm/i915/gt/intel_renderstate.c
@@ -207,7 +207,7 @@ int intel_renderstate_init(struct intel_renderstate *so,
        if (err)
                goto err_context;
 
-       err = i915_vma_pin(so->vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
+       err = i915_vma_pin_ww(so->vma, &so->ww, 0, 0, PIN_GLOBAL | PIN_HIGH);
        if (err)
                goto err_context;
 
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 164e23e0fc11..837706d28cc5 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -869,6 +869,8 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct 
i915_gem_ww_ctx *ww,
 #ifdef CONFIG_PROVE_LOCKING
        if (debug_locks && lockdep_is_held(&vma->vm->i915->drm.struct_mutex))
                WARN_ON(!ww);
+       if (debug_locks && ww && vma->resv)
+               assert_vma_held(vma);
 #endif
 
        BUILD_BUG_ON(PIN_GLOBAL != I915_VMA_GLOBAL_BIND);
@@ -1009,8 +1011,13 @@ int i915_ggtt_pin(struct i915_vma *vma, struct 
i915_gem_ww_ctx *ww,
 
        GEM_BUG_ON(!i915_vma_is_ggtt(vma));
 
+       WARN_ON(!ww && vma->resv && dma_resv_held(vma->resv));
+
        do {
-               err = i915_vma_pin_ww(vma, ww, 0, align, flags | PIN_GLOBAL);
+               if (ww)
+                       err = i915_vma_pin_ww(vma, ww, 0, align, flags | 
PIN_GLOBAL);
+               else
+                       err = i915_vma_pin(vma, 0, align, flags | PIN_GLOBAL);
                if (err != -ENOSPC) {
                        if (!err) {
                                err = i915_vma_wait_for_bind(vma);
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index 2e3779a8a437..d937ce950481 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -242,6 +242,7 @@ i915_vma_pin_ww(struct i915_vma *vma, struct 
i915_gem_ww_ctx *ww,
 static inline int __must_check
 i915_vma_pin(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
 {
+       WARN_ON_ONCE(vma->resv && dma_resv_held(vma->resv));
        return i915_vma_pin_ww(vma, NULL, size, alignment, flags);
 }
 
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx