| Message ID | 20170119132824.6852-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris Wilson <chris@chris-wilson.co.uk> writes: > A large object may need an invalid fence larger than u32 and so wrap. No > hardware can support such large fences, so it is safe to leave the check > as an assert. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> > --- > drivers/gpu/drm/i915/i915_vma.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index 68e66ffb95e8..3597e3c01342 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -115,6 +115,7 @@ vma_create(struct drm_i915_gem_object *obj, > i915_gem_object_get_tiling(obj), > i915_gem_object_get_stride(obj)); > GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I915_GTT_MIN_ALIGNMENT)); > + GEM_BUG_ON(vma->fence_size < vma->size); /* overflow */ > > vma->fence_alignment = i915_gem_fence_alignment(vm->i915, vma->size, > i915_gem_object_get_tiling(obj), > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 68e66ffb95e8..3597e3c01342 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -115,6 +115,7 @@ vma_create(struct drm_i915_gem_object *obj, i915_gem_object_get_tiling(obj), i915_gem_object_get_stride(obj)); GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I915_GTT_MIN_ALIGNMENT)); + GEM_BUG_ON(vma->fence_size < vma->size); /* overflow */ vma->fence_alignment = i915_gem_fence_alignment(vm->i915, vma->size, i915_gem_object_get_tiling(obj),
A large object may need an invalid fence larger than u32 and so wrap. No hardware can support such large fences, so it is safe to leave the check as an assert. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_vma.c | 1 + 1 file changed, 1 insertion(+)