Skip to contentSkip to conversation

drm/gem-dma: Remove unnecessary calls

PATCH In review Thomas Zimmermann 3 participants 9 messages Jun 20, 2023 – Jun 21, 2023

Subsystems (6)
lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

cover drm/gem-dma: Remove unnecessary calls

Remove rockchip's dependency on GEM DMA helpers. Rework the GEM DMA interface to fit the needs of rcar-du.

This intends to be a cleanup with no functional changes. With the patches merged, a later patchset can attempt to generate some of the boiler-plate code for struct drm_gem_object_funcs automatically.

Thomas Zimmermann (3):
drm/rcar-du: Import buffers with GEM DMA's helpers drm/rockchip: Resolve dependency in GEM DMA helpers drm/gem-dma: Unexport drm_gem_dma_vm_ops

 drivers/gpu/drm/drm_gem_dma_helper.c          | 16 ++++-----
 drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 33 +++----------------
 drivers/gpu/drm/rockchip/Kconfig              |  1 -
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |  2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c   |  8 +++--
 include/drm/drm_gem_dma_helper.h              |  5 +--
 6 files changed, 22 insertions(+), 43 deletions(-)

base-commit: 32e260cd0d16cee6f33e747679f168d63ea54bf6

Signature · 1 line
2.41.0
author maintainer
#4 lore raw

PATCH 2/3 drm/rockchip: Resolve dependency in GEM DMA helpers

Remove the dependency on the GEM DMA helper library. Rockchip comes with its own implementation of the GEM interface. It only uses the VM callbacks in drm_gem_dma_vm_ops from the GEM DMA helpers. These are not DMA specific.

Duplicate drm_gem_dma_vm_ops in rockchip and remove all dependencies on the GEM DMA helper library.

---
 drivers/gpu/drm/rockchip/Kconfig            | 1 -
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/rockchip/Kconfig +0 -1
index 1bf3e2829cd07..5f49cd0210e6b 100644
@@ -2,7 +2,6 @@
 config DRM_ROCKCHIP
 	tristate "DRM Support for Rockchip"
 	depends on DRM && ROCKCHIP_IOMMU
-	select DRM_GEM_DMA_HELPER
 	select DRM_KMS_HELPER
 	select DRM_PANEL
 	select VIDEOMODE_HELPERS
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +1 -1
index b8cf89f0cc566..b090b8abb6637 100644
@@ -18,7 +18,7 @@
 #include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fbdev_generic.h>
-#include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +6 -2
index b8f8b45ebf594..acb6f122a2dca 100644
@@ -11,13 +11,17 @@
 #include <drm/drm.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem.h>
-#include <drm/drm_gem_dma_helper.h>
 #include <drm/drm_prime.h>
 #include <drm/drm_vma_manager.h>
 
 #include "rockchip_drm_drv.h"
 #include "rockchip_drm_gem.h"
 
+static const struct vm_operations_struct rockchip_gem_vm_ops = {
+	.open = drm_gem_vm_open,
+	.close = drm_gem_vm_close,
+};
+
 static int rockchip_gem_iommu_map(struct rockchip_gem_object *rk_obj)
 {
 	struct drm_device *drm = rk_obj->base.dev;
@@ -276,7 +280,7 @@ static const struct drm_gem_object_funcs rockchip_gem_object_funcs = {
 	.vmap = rockchip_gem_prime_vmap,
 	.vunmap	= rockchip_gem_prime_vunmap,
 	.mmap = rockchip_drm_gem_object_mmap,
-	.vm_ops = &drm_gem_dma_vm_ops,
+	.vm_ops = &rockchip_gem_vm_ops,
 };
 
 static struct rockchip_gem_object *
Signature · 1 line
2.41.0
author maintainer
#1 lore raw

PATCH 1/3 drm/rcar-du: Import buffers with GEM DMA's helpers

In reply to Thomas Zimmermann

Call __drm_gem_dma_create() to create an object for imported buffers, instead of reimplementing the function within the driver. Reduces code duplication and will later allow to un-export a number of symbols from the GEM DMA helpers.

---
 drivers/gpu/drm/drm_gem_dma_helper.c          |  5 +--
 drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 33 +++----------------
 include/drm/drm_gem_dma_helper.h              |  3 ++
 3 files changed, 10 insertions(+), 31 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +3 -2
index 870b90b78bc4e..e9aa3ac140654 100644
@@ -67,8 +67,8 @@ static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
  * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative
  * error code on failure.
  */
-static struct drm_gem_dma_object *
-__drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private)
 {
 	struct drm_gem_dma_object *dma_obj;
 	struct drm_gem_object *gem_obj;
@@ -112,6 +112,7 @@ __drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
 	kfree(dma_obj);
 	return ERR_PTR(ret);
 }
+EXPORT_SYMBOL_GPL(__drm_gem_dma_create);
 
 /**
  * drm_gem_dma_create - allocate an object with the given size
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +4 -29
index adfb36b0e8154..ea7487e270f13 100644
@@ -356,49 +356,24 @@ const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc)
  * Frame buffer
  */
 
-static const struct drm_gem_object_funcs rcar_du_gem_funcs = {
-	.free = drm_gem_dma_object_free,
-	.print_info = drm_gem_dma_object_print_info,
-	.get_sg_table = drm_gem_dma_object_get_sg_table,
-	.vmap = drm_gem_dma_object_vmap,
-	.mmap = drm_gem_dma_object_mmap,
-	.vm_ops = &drm_gem_dma_vm_ops,
-};
-
 struct drm_gem_object *rcar_du_gem_prime_import_sg_table(struct drm_device *dev,
 				struct dma_buf_attachment *attach,
 				struct sg_table *sgt)
 {
 	struct rcar_du_device *rcdu = to_rcar_du_device(dev);
 	struct drm_gem_dma_object *dma_obj;
-	struct drm_gem_object *gem_obj;
-	int ret;
 
 	if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
 		return drm_gem_dma_prime_import_sg_table(dev, attach, sgt);
 
-	/* Create a DMA GEM buffer. */
-	dma_obj = kzalloc(sizeof(*dma_obj), GFP_KERNEL);
-	if (!dma_obj)
-		return ERR_PTR(-ENOMEM);
-
-	gem_obj = &dma_obj->base;
-	gem_obj->funcs = &rcar_du_gem_funcs;
-
-	drm_gem_private_object_init(dev, gem_obj, attach->dmabuf->size);
-	dma_obj->map_noncoherent = false;
-
-	ret = drm_gem_create_mmap_offset(gem_obj);
-	if (ret) {
-		drm_gem_object_release(gem_obj);
-		kfree(dma_obj);
-		return ERR_PTR(ret);
-	}
+	dma_obj = __drm_gem_dma_create(dev, attach->dmabuf->size, true);
+	if (IS_ERR(dma_obj))
+		return ERR_CAST(dma_obj);
 
 	dma_obj->dma_addr = 0;
 	dma_obj->sgt = sgt;
 
-	return gem_obj;
+	return &dma_obj->base;
 }
 
 int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev,
include/drm/drm_gem_dma_helper.h +3 -0
index 61da596780b64..3877cbf0e927c 100644
@@ -32,6 +32,9 @@ struct drm_gem_dma_object {
 #define to_drm_gem_dma_obj(gem_obj) \
 	container_of(gem_obj, struct drm_gem_dma_object, base)
 
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private);
+
 struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm,
 					      size_t size);
 void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj);
Signature · 1 line
2.41.0
author maintainer
#7 lore raw

PATCH 3/3 drm/gem-dma: Unexport drm_gem_dma_vm_ops

In reply to Thomas Zimmermann

There are no external users of drm_gem_dma_vm_ops. Unexport the symbol.

---
 drivers/gpu/drm/drm_gem_dma_helper.c | 11 +++++------
 include/drm/drm_gem_dma_helper.h     |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +5 -6
index e9aa3ac140654..d8a415c3d156c 100644
@@ -45,6 +45,11 @@
  * drm_gem_dma_vmap()). These helpers perform the necessary type conversion.
  */
 
+static const struct vm_operations_struct drm_gem_dma_vm_ops = {
+	.open = drm_gem_vm_open,
+	.close = drm_gem_vm_close,
+};
+
 static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
 	.free = drm_gem_dma_object_free,
 	.print_info = drm_gem_dma_object_print_info,
@@ -315,12 +320,6 @@ int drm_gem_dma_dumb_create(struct drm_file *file_priv,
 }
 EXPORT_SYMBOL_GPL(drm_gem_dma_dumb_create);
 
-const struct vm_operations_struct drm_gem_dma_vm_ops = {
-	.open = drm_gem_vm_open,
-	.close = drm_gem_vm_close,
-};
-EXPORT_SYMBOL_GPL(drm_gem_dma_vm_ops);
-
 #ifndef CONFIG_MMU
 /**
  * drm_gem_dma_get_unmapped_area - propose address for mapping in noMMU cases
include/drm/drm_gem_dma_helper.h +0 -2
index 3877cbf0e927c..88a810f954fce 100644
@@ -45,8 +45,6 @@ int drm_gem_dma_vmap(struct drm_gem_dma_object *dma_obj,
 		     struct iosys_map *map);
 int drm_gem_dma_mmap(struct drm_gem_dma_object *dma_obj, struct vm_area_struct *vma);
 
-extern const struct vm_operations_struct drm_gem_dma_vm_ops;
-
 /*
  * GEM object functions
  */
Signature · 1 line
2.41.0
#5 lore raw

Re: [PATCH 2/3] drm/rockchip: Resolve dependency in GEM DMA helpers

In reply to Thomas Zimmermann

Hi Thomas,

Quoted 7 lines · Thomas Zimmermann

Remove the dependency on the GEM DMA helper library. Rockchip comes with its own implementation of the GEM interface. It only uses the VM callbacks in drm_gem_dma_vm_ops from the GEM DMA helpers. These are not DMA specific.

Duplicate drm_gem_dma_vm_ops in rockchip and remove all dependencies on the GEM DMA helper library.

I have intentions to remove the entire custom implementation of the GEM interface and replace it with use of GEM DMA helpers in a future series.

Current custom implementation break import of video framebuffers located in memory beyond 4GB. Switching to use pure GEM DMA helpers solved that issue but requires reworking IOMMU integration for full support of multiple VOPs on e.g., RK3288 and RK3399.

I have no ETA on when such series can be ready so this is more of a heads up that I will revert this removal of dependency on GEM DMA helper library in a future series.

Regards,
Jonas

Quoted 8 lines
---
 drivers/gpu/drm/rockchip/Kconfig            | 1 -
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

[snip]

author maintainer
#6 lore raw

Re: [PATCH 2/3] drm/rockchip: Resolve dependency in GEM DMA helpers

Hi

Am 20.06.23 um 15:56 schrieb Jonas Karlman:

Quoted 14 lines

Hi Thomas,

Quoted 7 lines · Thomas Zimmermann

Remove the dependency on the GEM DMA helper library. Rockchip comes with its own implementation of the GEM interface. It only uses the VM callbacks in drm_gem_dma_vm_ops from the GEM DMA helpers. These are not DMA specific.

Duplicate drm_gem_dma_vm_ops in rockchip and remove all dependencies on the GEM DMA helper library.

I have intentions to remove the entire custom implementation of the GEM interface and replace it with use of GEM DMA helpers in a future series.

Quoted 8 lines

Current custom implementation break import of video framebuffers located in memory beyond 4GB. Switching to use pure GEM DMA helpers solved that issue but requires reworking IOMMU integration for full support of multiple VOPs on e.g., RK3288 and RK3399.

I have no ETA on when such series can be ready so this is more of a heads up that I will revert this removal of dependency on GEM DMA helper library in a future series.

No problem. I'm only interested in cleaning up the current interfaces. Rockchip can easily switch to real GEM DMA code.

Best regards
Thomas

Quoted 13 lines

Regards,
Jonas

Quoted 8 lines
---
  drivers/gpu/drm/rockchip/Kconfig            | 1 -
  drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
  drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++--
  3 files changed, 7 insertions(+), 4 deletions(-)

[snip]

Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/rcar-du: Import buffers with GEM DMA's helpers

In reply to Thomas Zimmermann

Hi Thomas,

Thank you for the patch.

Quoted 6 lines · Thomas Zimmermann

Call __drm_gem_dma_create() to create an object for imported buffers, instead of reimplementing the function within the driver. Reduces code duplication and will later allow to un-export a number of symbols from the GEM DMA helpers.

Nice simplification.

I assume you'll merge the whole series through drm-misc, please let me know if that's not correct.

Quoted 101 lines
---
 drivers/gpu/drm/drm_gem_dma_helper.c          |  5 +--
 drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 33 +++----------------
 include/drm/drm_gem_dma_helper.h              |  3 ++
 3 files changed, 10 insertions(+), 31 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +3 -2
index 870b90b78bc4e..e9aa3ac140654 100644
@@ -67,8 +67,8 @@ static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
  * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative
  * error code on failure.
  */
-static struct drm_gem_dma_object *
-__drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private)
 {
 	struct drm_gem_dma_object *dma_obj;
 	struct drm_gem_object *gem_obj;
@@ -112,6 +112,7 @@ __drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
 	kfree(dma_obj);
 	return ERR_PTR(ret);
 }
+EXPORT_SYMBOL_GPL(__drm_gem_dma_create);
 
 /**
  * drm_gem_dma_create - allocate an object with the given size
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +4 -29
index adfb36b0e8154..ea7487e270f13 100644
@@ -356,49 +356,24 @@ const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc)
  * Frame buffer
  */
 
-static const struct drm_gem_object_funcs rcar_du_gem_funcs = {
-	.free = drm_gem_dma_object_free,
-	.print_info = drm_gem_dma_object_print_info,
-	.get_sg_table = drm_gem_dma_object_get_sg_table,
-	.vmap = drm_gem_dma_object_vmap,
-	.mmap = drm_gem_dma_object_mmap,
-	.vm_ops = &drm_gem_dma_vm_ops,
-};
-
 struct drm_gem_object *rcar_du_gem_prime_import_sg_table(struct drm_device *dev,
 				struct dma_buf_attachment *attach,
 				struct sg_table *sgt)
 {
 	struct rcar_du_device *rcdu = to_rcar_du_device(dev);
 	struct drm_gem_dma_object *dma_obj;
-	struct drm_gem_object *gem_obj;
-	int ret;
 
 	if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
 		return drm_gem_dma_prime_import_sg_table(dev, attach, sgt);
 
-	/* Create a DMA GEM buffer. */
-	dma_obj = kzalloc(sizeof(*dma_obj), GFP_KERNEL);
-	if (!dma_obj)
-		return ERR_PTR(-ENOMEM);
-
-	gem_obj = &dma_obj->base;
-	gem_obj->funcs = &rcar_du_gem_funcs;
-
-	drm_gem_private_object_init(dev, gem_obj, attach->dmabuf->size);
-	dma_obj->map_noncoherent = false;
-
-	ret = drm_gem_create_mmap_offset(gem_obj);
-	if (ret) {
-		drm_gem_object_release(gem_obj);
-		kfree(dma_obj);
-		return ERR_PTR(ret);
-	}
+	dma_obj = __drm_gem_dma_create(dev, attach->dmabuf->size, true);
+	if (IS_ERR(dma_obj))
+		return ERR_CAST(dma_obj);
 
 	dma_obj->dma_addr = 0;
 	dma_obj->sgt = sgt;
 
-	return gem_obj;
+	return &dma_obj->base;
 }
 
 int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev,
include/drm/drm_gem_dma_helper.h +3 -0
index 61da596780b64..3877cbf0e927c 100644
@@ -32,6 +32,9 @@ struct drm_gem_dma_object {
 #define to_drm_gem_dma_obj(gem_obj) \
 	container_of(gem_obj, struct drm_gem_dma_object, base)
 
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private);
+
 struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm,
 					      size_t size);
 void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj);
Signature · 3 lines
Regards,

Laurent Pinchart
Reviewed-by on v1 3/3
#8 lore raw

Re: [PATCH 3/3] drm/gem-dma: Unexport drm_gem_dma_vm_ops

In reply to Thomas Zimmermann

Hi Thomas,

Thank you for the patch.

Quoted 3 lines · Thomas Zimmermann

There are no external users of drm_gem_dma_vm_ops. Unexport the symbol.

Quoted 47 lines
---
 drivers/gpu/drm/drm_gem_dma_helper.c | 11 +++++------
 include/drm/drm_gem_dma_helper.h     |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +5 -6
index e9aa3ac140654..d8a415c3d156c 100644
@@ -45,6 +45,11 @@
  * drm_gem_dma_vmap()). These helpers perform the necessary type conversion.
  */
 
+static const struct vm_operations_struct drm_gem_dma_vm_ops = {
+	.open = drm_gem_vm_open,
+	.close = drm_gem_vm_close,
+};
+
 static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
 	.free = drm_gem_dma_object_free,
 	.print_info = drm_gem_dma_object_print_info,
@@ -315,12 +320,6 @@ int drm_gem_dma_dumb_create(struct drm_file *file_priv,
 }
 EXPORT_SYMBOL_GPL(drm_gem_dma_dumb_create);
 
-const struct vm_operations_struct drm_gem_dma_vm_ops = {
-	.open = drm_gem_vm_open,
-	.close = drm_gem_vm_close,
-};
-EXPORT_SYMBOL_GPL(drm_gem_dma_vm_ops);
-
 #ifndef CONFIG_MMU
 /**
  * drm_gem_dma_get_unmapped_area - propose address for mapping in noMMU cases
include/drm/drm_gem_dma_helper.h +0 -2
index 3877cbf0e927c..88a810f954fce 100644
@@ -45,8 +45,6 @@ int drm_gem_dma_vmap(struct drm_gem_dma_object *dma_obj,
 		     struct iosys_map *map);
 int drm_gem_dma_mmap(struct drm_gem_dma_object *dma_obj, struct vm_area_struct *vma);
 
-extern const struct vm_operations_struct drm_gem_dma_vm_ops;
-
 /*
  * GEM object functions
  */
Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#3 lore raw

Re: [PATCH 1/3] drm/rcar-du: Import buffers with GEM DMA's helpers

In reply to Laurent Pinchart

Hi

Am 20.06.23 um 18:47 schrieb Laurent Pinchart:

Quoted 11 lines

Hi Thomas,

Thank you for the patch.

Quoted 5 lines · Thomas Zimmermann

Call __drm_gem_dma_create() to create an object for imported buffers, instead of reimplementing the function within the driver. Reduces code duplication and will later allow to un-export a number of symbols from the GEM DMA helpers.

Quoted 8 lines
Quoted 1 line

Nice simplification.

I assume you'll merge the whole series through drm-misc, please let me know if that's not correct.

Thanks for the reviews. The patchset can hopefully go through drm-misc-next.

Best regards
Thomas

Quoted 103 lines
Quoted 102 lines
---
  drivers/gpu/drm/drm_gem_dma_helper.c          |  5 +--
  drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 33 +++----------------
  include/drm/drm_gem_dma_helper.h              |  3 ++
  3 files changed, 10 insertions(+), 31 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +3 -2
index 870b90b78bc4e..e9aa3ac140654 100644
@@ -67,8 +67,8 @@ static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
   * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative
   * error code on failure.
   */
-static struct drm_gem_dma_object *
-__drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private)
  {
  	struct drm_gem_dma_object *dma_obj;
  	struct drm_gem_object *gem_obj;
@@ -112,6 +112,7 @@ __drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
  	kfree(dma_obj);
  	return ERR_PTR(ret);
  }
+EXPORT_SYMBOL_GPL(__drm_gem_dma_create);
 
  /**
   * drm_gem_dma_create - allocate an object with the given size
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +4 -29
index adfb36b0e8154..ea7487e270f13 100644
@@ -356,49 +356,24 @@ const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc)
   * Frame buffer
   */
 
-static const struct drm_gem_object_funcs rcar_du_gem_funcs = {
-	.free = drm_gem_dma_object_free,
-	.print_info = drm_gem_dma_object_print_info,
-	.get_sg_table = drm_gem_dma_object_get_sg_table,
-	.vmap = drm_gem_dma_object_vmap,
-	.mmap = drm_gem_dma_object_mmap,
-	.vm_ops = &drm_gem_dma_vm_ops,
-};
-
  struct drm_gem_object *rcar_du_gem_prime_import_sg_table(struct drm_device *dev,
  				struct dma_buf_attachment *attach,
  				struct sg_table *sgt)
  {
  	struct rcar_du_device *rcdu = to_rcar_du_device(dev);
  	struct drm_gem_dma_object *dma_obj;
-	struct drm_gem_object *gem_obj;
-	int ret;
 
  	if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
  		return drm_gem_dma_prime_import_sg_table(dev, attach, sgt);
 
-	/* Create a DMA GEM buffer. */
-	dma_obj = kzalloc(sizeof(*dma_obj), GFP_KERNEL);
-	if (!dma_obj)
-		return ERR_PTR(-ENOMEM);
-
-	gem_obj = &dma_obj->base;
-	gem_obj->funcs = &rcar_du_gem_funcs;
-
-	drm_gem_private_object_init(dev, gem_obj, attach->dmabuf->size);
-	dma_obj->map_noncoherent = false;
-
-	ret = drm_gem_create_mmap_offset(gem_obj);
-	if (ret) {
-		drm_gem_object_release(gem_obj);
-		kfree(dma_obj);
-		return ERR_PTR(ret);
-	}
+	dma_obj = __drm_gem_dma_create(dev, attach->dmabuf->size, true);
+	if (IS_ERR(dma_obj))
+		return ERR_CAST(dma_obj);
 
  	dma_obj->dma_addr = 0;
  	dma_obj->sgt = sgt;
 
-	return gem_obj;
+	return &dma_obj->base;
  }
 
  int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev,
include/drm/drm_gem_dma_helper.h +3 -0
index 61da596780b64..3877cbf0e927c 100644
@@ -32,6 +32,9 @@ struct drm_gem_dma_object {
  #define to_drm_gem_dma_obj(gem_obj) \
  	container_of(gem_obj, struct drm_gem_dma_object, base)
 
+struct drm_gem_dma_object *__drm_gem_dma_create(struct drm_device *drm,
+						size_t size, bool private);
+
  struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm,
  					      size_t size);
  void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj);
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)