Skip to content

Commit

Permalink
drm/i915: Markup GEM API with lockdep asserts
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Chris Wilson committed Oct 28, 2016
1 parent 4e50f08 commit 4c7d62c
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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--;
Expand Down
21 changes: 21 additions & 0 deletions drivers/gpu/drm/i915/i915_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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.
*/
Expand Down Expand Up @@ -3774,6 +3789,8 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
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;

Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion drivers/gpu/drm/i915/i915_gem_evict.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_gtt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_render_state.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);

/*
Expand Down

0 comments on commit 4c7d62c

Please sign in to comment.