drm/i915/gem: Suppress some random warnings

Leave the error propagation in place, but limit the warnings to only
show up in CI if the unlikely errors are hit.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200525141957.3061-2-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index e4fb6c3725370cf30d444b412c0b70c40ccf7155..219a36995b962f0f731faa6f5fc30e6e9ed0975d 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1626,8 +1626,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
                        err = i915_vma_bind(target->vma,
                                            target->vma->obj->cache_level,
                                            PIN_GLOBAL, NULL);
-                       if (drm_WARN_ONCE(&i915->drm, err,
-                                     "Unexpected failure to bind target VMA!"))
+                       if (err)
                                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 da845ff0cacce96935d6aff48197aff1ac449b4e..021c747b5387cec2a30ff081c2ad9956a949bfc4 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -29,8 +29,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
        void *dst;
        int i;
 
-       if (drm_WARN_ON(obj->base.dev,
-                       i915_gem_object_needs_bit17_swizzle(obj)))
+       if (GEM_WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
                return -EINVAL;
 
        /*

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index 7aff3514d97a9820321557e977be403547e8b19f..7cf8548ff708b95033a5130b971a0986388b889e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -147,8 +147,7 @@ rebuild_st:
                last_pfn = page_to_pfn(page);
 
                /* Check that the i965g/gm workaround works. */
-               drm_WARN_ON(&i915->drm,
-                           (gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL));
+               GEM_BUG_ON(gfp & __GFP_DMA32 && last_pfn >= 0x00100000UL);
        }
        if (sg) { /* loop terminated early; short sg table */
                sg_page_sizes |= sg->length;

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 8b0708708671f74332593eff450ce8b690fd8c0c..2226146b01c983f1d622b38c908c49bc740e650d 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 (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
+       if (GEM_WARN_ON(!obj->userptr.mm))
                return -EINVAL;
 
        mn = i915_mmu_notifier_find(obj->userptr.mm);