Skip to content

Commit

Permalink
drm/i915/gem: Suppress some random warnings
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Chris Wilson committed May 25, 2020
1 parent 1d93949 commit ea97c4c
Showing 4 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Original file line number Diff line number Diff line change
@@ -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;
}
}
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/gem/i915_gem_phys.c
Original file line number Diff line number Diff line change
@@ -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;

/*
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gem/i915_gem_userptr.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit ea97c4c

Please sign in to comment.