Message ID | 20200212085432.1250807-1-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915/selftests: Avoid choosing zero for phys_sz | expand |
On 12/02/2020 08:54, Chris Wilson wrote: > Make sure we avoid ending up with a phys_sz of 0, or for phys_sz to be > larger than the actual size. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c index f29da4560dc0..31549ad83fa6 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c @@ -247,10 +247,11 @@ static int igt_fill_blt_thread(void *arg) total = min(total, max); sz = i915_prandom_u32_max_state(total, prng) + 1; - phys_sz = sz % max_phys_size; + phys_sz = sz % max_phys_size + 1; sz = round_up(sz, PAGE_SIZE); phys_sz = round_up(phys_sz, PAGE_SIZE); + phys_sz = min(phys_sz, sz); pr_debug("%s with phys_sz= %x, sz=%x, val=%x\n", __func__, phys_sz, sz, val); @@ -364,10 +365,11 @@ static int igt_copy_blt_thread(void *arg) total = min(total, max); sz = i915_prandom_u32_max_state(total, prng) + 1; - phys_sz = sz % max_phys_size; + phys_sz = sz % max_phys_size + 1; sz = round_up(sz, PAGE_SIZE); phys_sz = round_up(phys_sz, PAGE_SIZE); + phys_sz = min(phys_sz, sz); pr_debug("%s with phys_sz= %x, sz=%x, val=%x\n", __func__, phys_sz, sz, val);
Make sure we avoid ending up with a phys_sz of 0, or for phys_sz to be larger than the actual size. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)