diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-12 08:54:32 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-12 10:14:06 +0000 |
| commit | c8b56cd01433afd2ce3ecf1255ca220283e84be8 (patch) | |
| tree | d8e62a3347f541bdbd15a4464547a86d744bfc8e /drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c | |
| parent | 37305ede63c7e5a696b74b64ffb7c62cbe0ecd2f (diff) | |
drm/i915/selftests: Avoid choosing zero for phys_sz
Make sure we avoid ending up with a phys_sz of 0, or for phys_sz to be
larger than the actual size.
Closes: https://patchwork.freedesktop.org/series/73320/
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20200212085432.1250807-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |