drm/i915: Markup GEM API with lockdep asserts

Add lockdep_assert_held(struct_mutex) to the API preamble of the
internal GEM interfaces.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161028125858.23563-9-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 96995d644da22be95bb314bf3d9a5d2785b0e21d..a1b9801296078b7d4d888aae2b99da328ceec8ee 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3432,6 +3432,7 @@ int __must_check i915_vma_put_fence(struct i915_vma *vma);
 static inline bool
 i915_vma_pin_fence(struct i915_vma *vma)
 {
+       lockdep_assert_held(&vma->vm->dev->struct_mutex);
        if (vma->fence) {
                vma->fence->pin_count++;
                return true;
@@ -3450,6 +3451,7 @@ i915_vma_pin_fence(struct i915_vma *vma)
 static inline void
 i915_vma_unpin_fence(struct i915_vma *vma)
 {
+       lockdep_assert_held(&vma->vm->dev->struct_mutex);
        if (vma->fence) {
                GEM_BUG_ON(vma->fence->pin_count <= 0);
                vma->fence->pin_count--;

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c0103044deded68faeae3d08ed0fb82d56aab954..528958d8fa5ac06b16327c7ef4617a0e1f0455fe 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -104,6 +104,8 @@ i915_gem_wait_for_error(struct i915_gpu_error *error)
 {
        int ret;
 
+       might_sleep();
+
        if (!i915_reset_in_progress(error))
                return 0;
 
@@ -2333,6 +2335,8 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
 {
        const struct drm_i915_gem_object_ops *ops = obj->ops;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        if (obj->pages == NULL)
                return 0;
 
@@ -2509,6 +2513,8 @@ i915_gem_object_get_pages(struct drm_i915_gem_object *obj)
        const struct drm_i915_gem_object_ops *ops = obj->ops;
        int ret;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        if (obj->pages)
                return 0;
 
@@ -2790,6 +2796,8 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
 
+       lockdep_assert_held(&dev_priv->drm.struct_mutex);
+
        i915_gem_retire_requests(dev_priv);
 
        for_each_engine(engine, dev_priv, id)
@@ -3031,6 +3039,8 @@ int i915_vma_unbind(struct i915_vma *vma)
        unsigned long active;
        int ret;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        /* First wait upon any activity as retiring the request may
         * have side-effects such as unpinning or even unbinding this vma.
         */
@@ -3427,6 +3437,7 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write)
        int ret;
 
        lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        ret = i915_gem_object_wait(obj,
                                   I915_WAIT_INTERRUPTIBLE |
                                   I915_WAIT_LOCKED |
@@ -3505,6 +3516,8 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
        struct i915_vma *vma;
        int ret = 0;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        if (obj->cache_level == cache_level)
                goto out;
 
@@ -3709,6 +3722,8 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
        u32 old_read_domains, old_write_domain;
        int ret;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        /* Mark the pin_display early so that we account for the
         * display coherency whilst setting up the cache domains.
         */
@@ -3774,6 +3789,8 @@ err_unpin_display:
 void
 i915_gem_object_unpin_from_display_plane(struct i915_vma *vma)
 {
+       lockdep_assert_held(&vma->vm->dev->struct_mutex);
+
        if (WARN_ON(vma->obj->pin_display == 0))
                return;
 
@@ -3802,6 +3819,7 @@ i915_gem_object_set_to_cpu_domain(struct drm_i915_gem_object *obj, bool write)
        int ret;
 
        lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        ret = i915_gem_object_wait(obj,
                                   I915_WAIT_INTERRUPTIBLE |
                                   I915_WAIT_LOCKED |
@@ -3962,6 +3980,7 @@ int __i915_vma_do_pin(struct i915_vma *vma,
        unsigned int bound = vma->flags;
        int ret;
 
+       lockdep_assert_held(&vma->vm->dev->struct_mutex);
        GEM_BUG_ON((flags & (PIN_GLOBAL | PIN_USER)) == 0);
        GEM_BUG_ON((flags & PIN_GLOBAL) && !i915_vma_is_ggtt(vma));
 
@@ -4003,6 +4022,8 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
        struct i915_vma *vma;
        int ret;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
+
        vma = i915_gem_obj_lookup_or_create_vma(obj, vm, view);
        if (IS_ERR(vma))
                return vma;

diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index a934f372c5cef40ec2414b6bde7f1e30e85d45e5..79b964152cd937e48a6d347bce096299ca99ee64 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -103,6 +103,7 @@ i915_gem_evict_something(struct i915_address_space *vm,
        struct i915_vma *vma, *next;
        int ret;
 
+       lockdep_assert_held(&vm->dev->struct_mutex);
        trace_i915_gem_evict(vm, min_size, alignment, flags);
 
        /*
@@ -213,6 +214,8 @@ i915_gem_evict_for_vma(struct i915_vma *target)
 {
        struct drm_mm_node *node, *next;
 
+       lockdep_assert_held(&target->vm->dev->struct_mutex);
+
        list_for_each_entry_safe(node, next,
                        &target->vm->mm.head_node.node_list,
                        node_list) {
@@ -266,7 +269,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
        struct i915_vma *vma, *next;
        int ret;
 
-       WARN_ON(!mutex_is_locked(&vm->dev->struct_mutex));
+       lockdep_assert_held(&vm->dev->struct_mutex);
        trace_i915_gem_evict_vm(vm);
 
        if (do_idle) {

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index a3a364478a89fe64c3048e1c305d97d7303196bb..2bbbda191e9364fa3ddd00708db358a30d60789e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3449,6 +3449,7 @@ i915_vma_create(struct drm_i915_gem_object *obj,
                struct i915_address_space *vm,
                const struct i915_ggtt_view *view)
 {
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
        GEM_BUG_ON(view && !i915_is_ggtt(vm));
        GEM_BUG_ON(i915_gem_obj_to_vma(obj, vm, view));
 
@@ -3476,6 +3477,7 @@ i915_gem_obj_lookup_or_create_vma(struct drm_i915_gem_object *obj,
 {
        struct i915_vma *vma;
 
+       lockdep_assert_held(&obj->base.dev->struct_mutex);
        GEM_BUG_ON(view && !i915_is_ggtt(vm));
 
        vma = i915_gem_obj_to_vma(obj, vm, view);

diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index 9625e1a662ed90bdb284557d14f19a40b1b10bfe..05293246e0b928fdf4ebcb9b7d70674a675445f8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -223,6 +223,8 @@ int i915_gem_render_state_emit(struct drm_i915_gem_request *req)
        struct intel_render_state *so;
        int ret;
 
+       lockdep_assert_held(&req->i915->drm.struct_mutex);
+
        so = req->engine->render_state;
        if (!so)
                return 0;

diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
index fbe0923fe0bcbf1ca9e9f337ab1a535ec8a30a3c..d234c28cbb9f2136e68b1c2059e9552d66cbdd85 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -143,6 +143,9 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)
 {
        struct i915_gem_active *active, *next;
 
+       lockdep_assert_held(&request->i915->drm.struct_mutex);
+       GEM_BUG_ON(!i915_gem_request_completed(request));
+
        trace_i915_gem_request_retire(request);
        list_del_init(&request->link);
 
@@ -268,6 +271,8 @@ int i915_gem_set_seqno(struct drm_device *dev, u32 seqno)
        struct drm_i915_private *dev_priv = to_i915(dev);
        int ret;
 
+       lockdep_assert_held(&dev_priv->drm.struct_mutex);
+
        if (seqno == 0)
                return -EINVAL;
 
@@ -612,6 +617,7 @@ void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches)
        u32 reserved_tail;
        int ret;
 
+       lockdep_assert_held(&request->i915->drm.struct_mutex);
        trace_i915_gem_request_add(request);
 
        /*