drm/i915/gem: Prefer drm_WARN* over WARN*

struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.

Prefer drm_WARN* over WARN* at places where struct drm_device pointer
can be extracted.

Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200504181600.18503-6-pankaj.laxminarayan.bharadiya@intel.com

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index c0d59d48e1986aee468d76cee45e78340cf5ae0c..e4fb6c3725370cf30d444b412c0b70c40ccf7155 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1626,7 +1626,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
                        err = i915_vma_bind(target->vma,
                                            target->vma->obj->cache_level,
                                            PIN_GLOBAL, NULL);
-                       if (WARN_ONCE(err,
+                       if (drm_WARN_ONCE(&i915->drm, err,
                                      "Unexpected failure to bind target VMA!"))
                                return err;
                }

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 698e22420dc5e946c17e956ab8fb57f3b6b8722d..da845ff0cacce96935d6aff48197aff1ac449b4e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -29,7 +29,8 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
        void *dst;
        int i;
 
-       if (WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
+       if (drm_WARN_ON(obj->base.dev,
+                       i915_gem_object_needs_bit17_swizzle(obj)))
                return -EINVAL;
 
        /*

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 7ffd7afeb7a5a12e2dcc6d5926b2c103507d0a7c..8b0708708671f74332593eff450ce8b690fd8c0c 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
        if (flags & I915_USERPTR_UNSYNCHRONIZED)
                return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
 
-       if (WARN_ON(obj->userptr.mm == NULL))
+       if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
                return -EINVAL;
 
        mn = i915_mmu_notifier_find(obj->userptr.mm);