From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> Purpose is catching illegal callers. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 81a83424fa13..51869496b299 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2916,6 +2916,8 @@ i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj, int n); static inline struct page * i915_gem_object_get_page(struct drm_i915_gem_object *obj, int n) { + WARN_ON_ONCE(!mutex_is_locked(&obj->base.dev->struct_mutex)); + if (WARN_ON(n >= obj->base.size >> PAGE_SHIFT)) return NULL; diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5a6daeaef680..b54b5619e07f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5250,6 +5250,8 @@ i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj, int n) { struct page *page; + WARN_ON_ONCE(!mutex_is_locked(&obj->base.dev->struct_mutex)); + /* Only default objects have per-page dirty tracking */ if (WARN_ON(obj->ops != &i915_gem_object_ops)) return NULL; -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx