| Message ID | 20210413094937.3736541-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] dma-buf: Require VM_PFNMAP vma for mmap | expand |
Hi Am 13.04.21 um 11:49 schrieb Daniel Vetter: > shmem helpers seem a bit sloppy here by automatically rounding up when > actually creating the buffer, which results in under-reporting of what > we actually have. Caught by igt/vgem_basic tests. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Drivers get it more wrong than right. I always felt that we should have all this in generic code with a few parameters somewhere. But makes sense. Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 6d625cee7a6a..d5e6d4568f99 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -505,13 +505,13 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, > > if (!args->pitch || !args->size) { > args->pitch = min_pitch; > - args->size = args->pitch * args->height; > + args->size = PAGE_ALIGN(args->pitch * args->height); > } else { > /* ensure sane minimum values */ > if (args->pitch < min_pitch) > args->pitch = min_pitch; > if (args->size < args->pitch * args->height) > - args->size = args->pitch * args->height; > + args->size = PAGE_ALIGN(args->pitch * args->height); > } > > shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle); >
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 6d625cee7a6a..d5e6d4568f99 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -505,13 +505,13 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, if (!args->pitch || !args->size) { args->pitch = min_pitch; - args->size = args->pitch * args->height; + args->size = PAGE_ALIGN(args->pitch * args->height); } else { /* ensure sane minimum values */ if (args->pitch < min_pitch) args->pitch = min_pitch; if (args->size < args->pitch * args->height) - args->size = args->pitch * args->height; + args->size = PAGE_ALIGN(args->pitch * args->height); } shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
shmem helpers seem a bit sloppy here by automatically rounding up when actually creating the buffer, which results in under-reporting of what we actually have. Caught by igt/vgem_basic tests. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)