| Message ID | 20220406173023.1039107-1-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/selftests: handle more rounding | expand |
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> On 4/6/2022 7:30 PM, Matthew Auld wrote: > Ensure we account for potential rounding up of lmem objects. > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5485 > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Nirmoy Das <nirmoy.das@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/selftest_migrate.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c > index c9c4f391c5cc..cca3b0db83c9 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c > +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c > @@ -621,13 +621,15 @@ static int perf_copy_blt(void *arg) > > for (i = 0; i < ARRAY_SIZE(sizes); i++) { > struct drm_i915_gem_object *src, *dst; > + size_t sz; > int err; > > src = create_init_lmem_internal(gt, sizes[i], true); > if (IS_ERR(src)) > return PTR_ERR(src); > > - dst = create_init_lmem_internal(gt, sizes[i], false); > + sz = src->base.size; > + dst = create_init_lmem_internal(gt, sz, false); > if (IS_ERR(dst)) { > err = PTR_ERR(dst); > goto err_src; > @@ -640,7 +642,7 @@ static int perf_copy_blt(void *arg) > dst->mm.pages->sgl, > I915_CACHE_NONE, > i915_gem_object_is_lmem(dst), > - sizes[i]); > + sz); > > i915_gem_object_unlock(dst); > i915_gem_object_put(dst);
diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c index c9c4f391c5cc..cca3b0db83c9 100644 --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c @@ -621,13 +621,15 @@ static int perf_copy_blt(void *arg) for (i = 0; i < ARRAY_SIZE(sizes); i++) { struct drm_i915_gem_object *src, *dst; + size_t sz; int err; src = create_init_lmem_internal(gt, sizes[i], true); if (IS_ERR(src)) return PTR_ERR(src); - dst = create_init_lmem_internal(gt, sizes[i], false); + sz = src->base.size; + dst = create_init_lmem_internal(gt, sz, false); if (IS_ERR(dst)) { err = PTR_ERR(dst); goto err_src; @@ -640,7 +642,7 @@ static int perf_copy_blt(void *arg) dst->mm.pages->sgl, I915_CACHE_NONE, i915_gem_object_is_lmem(dst), - sizes[i]); + sz); i915_gem_object_unlock(dst); i915_gem_object_put(dst);
Ensure we account for potential rounding up of lmem objects. Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5485 Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Nirmoy Das <nirmoy.das@linux.intel.com> --- drivers/gpu/drm/i915/gt/selftest_migrate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)