Chris Wilson <ch...@chris-wilson.co.uk> writes:
> 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 <ch...@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuopp...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +--
> drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +--
> drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +--
> drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
> 4 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index e4fb6c372537..219a36995b96 100644
> --- 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 4c1c7232b024..12245a47e5fb 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
> @@ -27,8 +27,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 7aff3514d97a..7cf8548ff708 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> @@ -147,8 +147,7 @@ static int shmem_get_pages(struct drm_i915_gem_object
> *obj)
> 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 8b0708708671..2226146b01c9 100644
> --- 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);
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
