Skip to contentSkip to conversation

drm/meson: add size and alignment requirements for dumb buffers

PATCH In review Neil Armstrong 2 participants 3 messages Apr 8, 2019 – Apr 17, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/meson: add size and alignment requirements for dumb buffers

The Amlogic SoCs Canvas buffers stride must be aligned on 64bytes and overall size should be aligned on PAGE width.

Adds a custom dumb_create op to adds these requirements.

Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
---
 drivers/gpu/drm/meson/meson_drv.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_drv.c +13 -1
index faf1b1b0357c..72b01e6be0d9 100644
@@ -90,6 +90,18 @@ static irqreturn_t meson_irq(int irq, void *arg)
 	return IRQ_HANDLED;
 }
 
+static int meson_dumb_create(struct drm_file *file, struct drm_device *dev,
+			     struct drm_mode_create_dumb *args)
+{
+	/*
+	 * We need 64bytes aligned stride, and PAGE aligned size
+	 */
+	args->pitch = ALIGN(DIV_ROUND_UP(args->width * args->bpp, 8), SZ_64);
+	args->size = PAGE_ALIGN(args->pitch * args->height);
+
+	return drm_gem_cma_dumb_create_internal(file, dev, args);
+}
+
 DEFINE_DRM_GEM_CMA_FOPS(fops);
 
 static struct drm_driver meson_driver = {
@@ -112,7 +124,7 @@ static struct drm_driver meson_driver = {
 	.gem_prime_mmap		= drm_gem_cma_prime_mmap,
 
 	/* GEM Ops */
-	.dumb_create		= drm_gem_cma_dumb_create,
+	.dumb_create		= meson_dumb_create,
 	.gem_free_object_unlocked = drm_gem_cma_free_object,
 	.gem_vm_ops		= &drm_gem_cma_vm_ops,
 
Signature · 1 line
2.21.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 37 lines · Neil Armstrong

The Amlogic SoCs Canvas buffers stride must be aligned on 64bytes and overall size should be aligned on PAGE width.

Adds a custom dumb_create op to adds these requirements.

Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
---
  drivers/gpu/drm/meson/meson_drv.c | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_drv.c +12 -0
index faf1b1b0357c..72b01e6be0d9 100644
@@ -90,6 +90,18 @@ static irqreturn_t meson_irq(int irq, void *arg)
  	return IRQ_HANDLED;
  }
 
+static int meson_dumb_create(struct drm_file *file, struct drm_device *dev,
+			     struct drm_mode_create_dumb *args)
+{
+	/*
+	 * We need 64bytes aligned stride, and PAGE aligned size
+	 */
+	args->pitch = ALIGN(DIV_ROUND_UP(args->width * args->bpp, 8), SZ_64);
+	args->size = PAGE_ALIGN(args->pitch * args->height);
+
+	return drm_gem_cma_dumb_create_internal(file, dev, args);
+}
+
  DEFINE_DRM_GEM_CMA_FOPS(fops);
 
  static struct drm_driver meson_driver = {

drivers/gpu/drm/meson/meson_drv.c static struct drm_driver meson_driver = { · line 130

Quoted 8 lines
drivers/gpu/drm/meson/meson_drv.c +1 -1
@@ -112,7 +124,7 @@ static struct drm_driver meson_driver = {
  	.gem_prime_mmap		= drm_gem_cma_prime_mmap,
 
  	/* GEM Ops */
-	.dumb_create		= drm_gem_cma_dumb_create,
+	.dumb_create		= meson_dumb_create,
  	.gem_free_object_unlocked = drm_gem_cma_free_object,
  	.gem_vm_ops		= &drm_gem_cma_vm_ops,
 
author Applied
#2 lore raw
Quoted 40 lines · Sky Zhou
Quoted 38 lines · Neil Armstrong

The Amlogic SoCs Canvas buffers stride must be aligned on 64bytes and overall size should be aligned on PAGE width.

Adds a custom dumb_create op to adds these requirements.

Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
---
  drivers/gpu/drm/meson/meson_drv.c | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_drv.c +12 -0
index faf1b1b0357c..72b01e6be0d9 100644
@@ -90,6 +90,18 @@ static irqreturn_t meson_irq(int irq, void *arg)
  	return IRQ_HANDLED;
  }
 
+static int meson_dumb_create(struct drm_file *file, struct drm_device *dev,
+			     struct drm_mode_create_dumb *args)
+{
+	/*
+	 * We need 64bytes aligned stride, and PAGE aligned size
+	 */
+	args->pitch = ALIGN(DIV_ROUND_UP(args->width * args->bpp, 8), SZ_64);
+	args->size = PAGE_ALIGN(args->pitch * args->height);
+
+	return drm_gem_cma_dumb_create_internal(file, dev, args);
+}
+
  DEFINE_DRM_GEM_CMA_FOPS(fops);
 
  static struct drm_driver meson_driver = {
@@ -112,7 +124,7 @@ static struct drm_driver meson_driver = {
  	.gem_prime_mmap		= drm_gem_cma_prime_mmap,
 
Quoted 10 lines

drivers/gpu/drm/meson/meson_drv.c static struct drm_driver meson_driver = { · line 130

Quoted 7 lines
drivers/gpu/drm/meson/meson_drv.c +1 -1
  	/* GEM Ops */
-	.dumb_create		= drm_gem_cma_dumb_create,
+	.dumb_create		= meson_dumb_create,
  	.gem_free_object_unlocked = drm_gem_cma_free_object,
  	.gem_vm_ops		= &drm_gem_cma_vm_ops,
 

Applied to drm-misc-next, thanks !