Call drm_mode_size_dumb() to compute dumb-buffer scanline pitch and
buffer size. Align the pitch to a multiple of 8.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
Reviewed-by: Tomi Valkeinen <tomi.valkei...@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkei...@ideasonboard.com>
---
 drivers/gpu/drm/omapdrm/omap_gem.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c 
b/drivers/gpu/drm/omapdrm/omap_gem.c
index 381552bfb409..78563a8d8732 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -10,6 +10,7 @@
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
 
+#include <drm/drm_dumb_buffers.h>
 #include <drm/drm_prime.h>
 #include <drm/drm_vma_manager.h>
 
@@ -580,15 +581,13 @@ static int omap_gem_object_mmap(struct drm_gem_object 
*obj, struct vm_area_struc
 int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
                struct drm_mode_create_dumb *args)
 {
-       union omap_gem_size gsize;
-
-       args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
-
-       args->size = PAGE_ALIGN(args->pitch * args->height);
+       union omap_gem_size gsize = { };
+       int ret;
 
-       gsize = (union omap_gem_size){
-               .bytes = args->size,
-       };
+       ret = drm_mode_size_dumb(dev, args, SZ_8, 0);
+       if (ret)
+               return ret;
+       gsize.bytes = args->size;
 
        return omap_gem_new_handle(dev, file, gsize,
                        OMAP_BO_SCANOUT | OMAP_BO_WC, &args->handle);
-- 
2.50.1


Reply via email to