Convert most CMA-based drivers to GEM object functions
Subsystems (31)
Thomas Zimmermann
maintainerv3 cover Convert most CMA-based drivers to GEM object functions
Most of the CMA-based drivers use the default implementation for the callbacks in struct drm_driver. With this patch, these interfaces are initialized with a common helper macro and GEM object functions replace several deprecated interfaces.
To address Laurent's comment on the amount of changes per patch, I re- organized the series.
1) There are now DRIVER_OPS macros for drivers that require a virtual address on imported buffers, and macros for drivers that don't. Therefore, drivers don't switch to drm_gem_cma_prime_import_sg_table_vmap() implicitly when they begin using the DRIVER_OPS macro.
2) I split each driver's patch into two: the first converts the driver to GEM CMA object functions, the second introduces the DRIVER_OPS macro. Neither patch should result in a functional change. I kept existing R-b and A-b tags on both patches. Existing Tested-by tags are only on the final patch, as that's closest to what has been tested.
3) I dropped the conversion to drm_gem_prime_mmap() from the patchset. As part of this change, the CMA object functions could provide an mmap function, which is worth it's own series. The patch for aspeed requires drm_gem_prime_mmap(), so I removed it from the series.
Patches 1 to 3 update the existing macro and helper to similar naming as with SHMEM, add a new DRIVER_OPS macro, and add helpers for drivers that override the default implementation for .dumb_create(). The remaining patches up to the final one convert the drivers. The kirin driver also changes to the default dumb_create function. The final patch deletes .gem_print_info from struct drm_driver.
I don't have much of the hardware, so it's only compile-tested on aarch64, arm and x86-64 only. Several patches have Tested-by tags.
v3:
* reorganized the series
* split each driver patch into two small ones (Laurent)
* drop the conversion to drm_gem_prime_mmap()
* remove the patch for aspeed
v2:
* add more detailed commit messages (Laurent, Sam)
* use default .dumb_create implementation in kirin (Emil)
* fix zte build error (Sam, Emil)
* introduce DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (everyone)
Thomas Zimmermann (43):
drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_ drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA
functions
drm/arc: Use GEM CMA object functions
drm/arc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/arm: Use GEM CMA object functions
drm/arm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/atmel-hlcdc: Use GEM CMA object functions drm/atmel-hlcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/fsl-dcu: Use GEM CMA object functions
drm/fsl-dcu: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create() drm/hisilicon/kirin: Use GEM CMA object functions drm/hisilicon/kirin: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/imx: Use GEM CMA object functions
drm/imx: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/ingenic: Use GEM CMA object functions
drm/ingenic: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/komeda: Use GEM CMA object functions
drm/komeda: Set GEM CMA functions with
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
drm/malidp: Use GEM CMA object functions
drm/malidp: Set GEM CMA functions with
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
drm/mcde: Use GEM CMA object functions
drm/mcde: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/meson: Use GEM CMA object functions
drm/meson: Set GEM CMA functions with
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
drm/mxsfb: Use GEM CMA object functions
drm/mxsfb: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/rcar-du: Use GEM CMA object functions
drm/rcar-du: Set GEM CMA functions with
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
drm/shmobile: Use GEM CMA object functions
drm/shmobile: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/stm: Use GEM CMA object functions
drm/stm: Set GEM CMA functions with
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
drm/sti: Use GEM CMA object functions
drm/sti: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/tilcdc: Use GEM CMA object functions
drm/tilcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/tve200: Use GEM CMA object functions
drm/tve200: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/zte: Use GEM CMA object functions
drm/zte: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
drm: Remove struct drm_driver.gem_print_info
drivers/gpu/drm/arc/arcpgu_drv.c | 12 +-- .../gpu/drm/arm/display/komeda/komeda_kms.c | 11 +-- drivers/gpu/drm/arm/hdlcd_drv.c | 12 +-- drivers/gpu/drm/arm/malidp_drv.c | 11 +-- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 11 +-- drivers/gpu/drm/drm_gem.c | 2 - drivers/gpu/drm/drm_gem_cma_helper.c | 12 +-- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +-- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +-- drivers/gpu/drm/imx/imx-drm-core.c | 12 +-- drivers/gpu/drm/ingenic/ingenic-drm.c | 13 +--- drivers/gpu/drm/mcde/mcde_drv.c | 12 +-- drivers/gpu/drm/meson/meson_drv.c | 15 +--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +-- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 +-- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 11 +-- drivers/gpu/drm/sti/sti_drv.c | 12 +-- drivers/gpu/drm/stm/drv.c | 11 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 13 +--- drivers/gpu/drm/tiny/hx8357d.c | 2 +- drivers/gpu/drm/tiny/ili9225.c | 2 +- drivers/gpu/drm/tiny/ili9341.c | 2 +- drivers/gpu/drm/tiny/ili9486.c | 2 +- drivers/gpu/drm/tiny/mi0283qt.c | 2 +- drivers/gpu/drm/tiny/repaper.c | 2 +- drivers/gpu/drm/tiny/st7586.c | 2 +- drivers/gpu/drm/tiny/st7735r.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 12 +-- drivers/gpu/drm/zte/zx_drm_drv.c | 11 +-- include/drm/drm_drv.h | 17 ----- include/drm/drm_gem_cma_helper.h | 74 +++++++++++++++++-- 34 files changed, 105 insertions(+), 247 deletions(-)
--
2.26.2
Thomas Zimmermann
maintainerPATCH v3 1/43 drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_
This fixes the naming of several symbols within CMA helpers. No functional changes are made.
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/drm_gem_cma_helper.c | 10 +++++----- include/drm/drm_gem_cma_helper.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -1
@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver aspeed_gfx_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_cma_gem_create_object_default_funcs, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
drivers/gpu/drm/drm_gem_cma_helper.c +5 -5
@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_vunmap); -static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { +static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { .free = drm_gem_cma_free_object, .print_info = drm_gem_cma_print_info, .get_sg_table = drm_gem_cma_prime_get_sg_table,
@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { };/** -* drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a +* drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a * default function table * @dev: DRM device * @size: Size of the object to allocate
@@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {* A pointer to a allocated GEM object or an error pointer on failure. */ struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size) +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size) {struct drm_gem_cma_object *cma_obj;
@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)if (!cma_obj)return NULL ; - cma_obj->base.funcs = &drm_cma_gem_default_funcs; + cma_obj->base.funcs = &drm_gem_cma_default_funcs;return &cma_obj->base; } -EXPORT_SYMBOL (drm_cma_gem_create_object_default_funcs); +EXPORT_SYMBOL (drm_gem_cma_create_object_default_funcs);/** * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's
include/drm/drm_gem_cma_helper.h +2 -2
@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr);struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size); +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size);/** * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual
@@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. */ #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ .dumb_create = drm_gem_cma_dumb_create, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \
Signature · 1 line
2.26.2
Re: [PATCH v3 01/43] drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_
Hi Thomas,
Thank you for the patch.
Quoted 4 lines · Thomas Zimmermann
This fixes the naming of several symbols within CMA helpers. No functional changes are made.
Signed-off-by Thomas Zimmermann <[email protected]>
Thank you for the patch.
Speaking of naming, I wish we could rename drm_gem_cma_* to something else, as those helpers don't use CMA directly (and may not use it at all), but I think that would be too much intrusive changes for too little gain :-(
Quoted 86 lines
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/drm_gem_cma_helper.c | 10 +++++----- include/drm/drm_gem_cma_helper.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver aspeed_gfx_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_cma_gem_create_object_default_funcs, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,drivers/gpu/drm/drm_gem_cma_helper.c +5
-5@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_vunmap); -static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { +static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { .free = drm_gem_cma_free_object, .print_info = drm_gem_cma_print_info, .get_sg_table = drm_gem_cma_prime_get_sg_table,@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { };/** -* drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a +* drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a * default function table * @dev: DRM device * @size: Size of the object to allocate @@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {* A pointer to a allocated GEM object or an error pointer on failure. */ struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size) +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size) {struct drm_gem_cma_object *cma_obj;@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)if (!cma_obj)return NULL ; - cma_obj->base.funcs = &drm_cma_gem_default_funcs; + cma_obj->base.funcs = &drm_gem_cma_default_funcs;return &cma_obj->base; } -EXPORT_SYMBOL (drm_cma_gem_create_object_default_funcs); +EXPORT_SYMBOL (drm_gem_cma_create_object_default_funcs);/** * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's include/drm/drm_gem_cma_helper.h +2
-2@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr);struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size); +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size);/** * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual @@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. */ #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ .dumb_create = drm_gem_cma_dumb_create, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerRe: [PATCH v3 01/43] drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_
Hi
Am 05.06.20 um 10:40 schrieb Laurent Pinchart:
Quoted 8 lines
Hi Thomas,
Thank you for the patch.
Quoted 3 lines · Thomas Zimmermann
This fixes the naming of several symbols within CMA helpers. No functional changes are made.
Quoted 8 lines
Quoted 1 line
Signed-off-by Thomas Zimmermann <[email protected]>Thank you for the patch.
Speaking of naming, I wish we could rename drm_gem_cma_* to something else, as those helpers don't use CMA directly (and may not use it at all), but I think that would be too much intrusive changes for too little gain :-(
I agree. Calling them GEM DMA helpers would be more precise. But I don't really see an easy solution without either a big patch that touches everything, or a lot of small patches with ugly intermediate states.
IMHO the best option would probably be an additional header file drm_gem_dma_helper.h that defines a dma name for each cma name. Drivers could then be converted individually with a single per-driver patch.
Best regards
Thomas
Quoted 88 lines
Quoted 87 lines
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/drm_gem_cma_helper.c | 10 +++++----- include/drm/drm_gem_cma_helper.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver aspeed_gfx_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_cma_gem_create_object_default_funcs, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,drivers/gpu/drm/drm_gem_cma_helper.c +5
-5@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_vunmap); -static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { +static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { .free = drm_gem_cma_free_object, .print_info = drm_gem_cma_print_info, .get_sg_table = drm_gem_cma_prime_get_sg_table,@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { };/** -* drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a +* drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a * default function table * @dev: DRM device * @size: Size of the object to allocate @@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {* A pointer to a allocated GEM object or an error pointer on failure. */ struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size) +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size) {struct drm_gem_cma_object *cma_obj;@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)if (!cma_obj)return NULL ; - cma_obj->base.funcs = &drm_cma_gem_default_funcs; + cma_obj->base.funcs = &drm_gem_cma_default_funcs;return &cma_obj->base; } -EXPORT_SYMBOL (drm_cma_gem_create_object_default_funcs); +EXPORT_SYMBOL (drm_gem_cma_create_object_default_funcs);/** * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's include/drm/drm_gem_cma_helper.h +2
-2@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr);struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size); +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size);/** * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual @@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. */ #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ .dumb_create = drm_gem_cma_dumb_create, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \
Signature · 14 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20200605/0bf6af9d/attachment-0001.sig>
Re: [PATCH v3 01/43] drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_
Quoted 20 lines · Thomas Zimmermann
Hi
Am 05.06.20 um 10:40 schrieb Laurent Pinchart:
Quoted 8 lines
Hi Thomas,
Thank you for the patch.
Quoted 3 lines · Thomas Zimmermann
This fixes the naming of several symbols within CMA helpers. No functional changes are made.
Quoted 8 lines
Quoted 1 line
Signed-off-by Thomas Zimmermann <[email protected]>Thank you for the patch.
Speaking of naming, I wish we could rename drm_gem_cma_* to something else, as those helpers don't use CMA directly (and may not use it at all), but I think that would be too much intrusive changes for too little gain :-(
Quoted 7 lines
I agree. Calling them GEM DMA helpers would be more precise. But I don't really see an easy solution without either a big patch that touches everything, or a lot of small patches with ugly intermediate states.
IMHO the best option would probably be an additional header file
drm_gem_dma_helper.hthat defines a dma name for each cma name. Drivers could then be converted individually with a single per-driver patch.
From todo.rst:
"
Rename CMA helpers to DMA helpers
---------------------------------
CMA (standing for contiguous memory allocator) is really a bit an accident of what these were used for first, a much better name would be DMA helpers. In the text these should even be called coherent DMA memory helpers (so maybe CDM, but no one knows what that means) since underneath they just use dma_alloc_coherent.
Contact: Laurent Pinchart, Daniel Vetter
Level: Intermediate (mostly because it is a huge tasks without good partial milestones, not technically itself that challenging)
"
The same?
Sam
Quoted 101 lines
Best regards
ThomasQuoted 88 lines
Quoted 87 lines
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/drm_gem_cma_helper.c | 10 +++++----- include/drm/drm_gem_cma_helper.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver aspeed_gfx_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_cma_gem_create_object_default_funcs, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,drivers/gpu/drm/drm_gem_cma_helper.c +5
-5@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_vunmap); -static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { +static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { .free = drm_gem_cma_free_object, .print_info = drm_gem_cma_print_info, .get_sg_table = drm_gem_cma_prime_get_sg_table,@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { };/** -* drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a +* drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a * default function table * @dev: DRM device * @size: Size of the object to allocate @@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {* A pointer to a allocated GEM object or an error pointer on failure. */ struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size) +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size) {struct drm_gem_cma_object *cma_obj;@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)if (!cma_obj)return NULL ; - cma_obj->base.funcs = &drm_cma_gem_default_funcs; + cma_obj->base.funcs = &drm_gem_cma_default_funcs;return &cma_obj->base; } -EXPORT_SYMBOL (drm_cma_gem_create_object_default_funcs); +EXPORT_SYMBOL (drm_gem_cma_create_object_default_funcs);/** * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's include/drm/drm_gem_cma_helper.h +2
-2@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr);struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size); +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size);/** * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual @@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. */ #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ .dumb_create = drm_gem_cma_dumb_create, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer
Thomas Zimmermann
maintainerRe: [PATCH v3 01/43] drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_
Hi
Am 05.06.20 um 16:23 schrieb Sam Ravnborg:
Quoted 40 lines · Thomas Zimmermann
Quoted 20 lines
Hi
Am 05.06.20 um 10:40 schrieb Laurent Pinchart:
Quoted 8 lines
Hi Thomas,
Thank you for the patch.
Quoted 3 lines · Thomas Zimmermann
This fixes the naming of several symbols within CMA helpers. No functional changes are made.
Quoted 8 lines
Quoted 1 line
Signed-off-by Thomas Zimmermann <[email protected]>Thank you for the patch.
Speaking of naming, I wish we could rename drm_gem_cma_* to something else, as those helpers don't use CMA directly (and may not use it at all), but I think that would be too much intrusive changes for too little gain :-(
Quoted 7 lines
I agree. Calling them GEM DMA helpers would be more precise. But I don't really see an easy solution without either a big patch that touches everything, or a lot of small patches with ugly intermediate states.
IMHO the best option would probably be an additional header file
drm_gem_dma_helper.hthat defines a dma name for each cma name. Drivers could then be converted individually with a single per-driver patch.From
todo.rst:"
Rename CMA helpers to DMA helpers
---------------------------------CMA (standing for contiguous memory allocator) is really a bit an accident of what these were used for first, a much better name would be DMA helpers. In the text these should even be called coherent DMA memory helpers (so maybe CDM, but no one knows what that means) since underneath they just use
dma_alloc_coherent.
Quoted 7 lines
Contact: Laurent Pinchart, Daniel Vetter
Level: Intermediate (mostly because it is a huge tasks without good partial milestones, not technically itself that challenging)
"The same?
Yes, I've been thinking of this. That would be a good task for someone to get familiar with the DRM code.
Best regards
Thomas
Quoted 112 lines
Sam
Quoted 80 lines
Best regards
ThomasQuoted 76 lines
Quoted 76 lines
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/drm_gem_cma_helper.c | 10 +++++----- include/drm/drm_gem_cma_helper.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver aspeed_gfx_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_cma_gem_create_object_default_funcs, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,drivers/gpu/drm/drm_gem_cma_helper.c +5
-5@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_vunmap); -static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { +static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { .free = drm_gem_cma_free_object, .print_info = drm_gem_cma_print_info, .get_sg_table = drm_gem_cma_prime_get_sg_table,@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { };/** -* drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a +* drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a * default function table * @dev: DRM device * @size: Size of the object to allocate @@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {* A pointer to a allocated GEM object or an error pointer on failure. */ struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size) +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size) {struct drm_gem_cma_object *cma_obj;@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)if (!cma_obj)return NULL ; - cma_obj->base.funcs = &drm_cma_gem_default_funcs; + cma_obj->base.funcs = &drm_gem_cma_default_funcs;return &cma_obj->base; } -EXPORT_SYMBOL (drm_cma_gem_create_object_default_funcs); +EXPORT_SYMBOL (drm_gem_cma_create_object_default_funcs);/** * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's include/drm/drm_gem_cma_helper.h +1
-1@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr);struct drm_gem_object * -drm_cma_gem_create_object_default_funcs (struct drm_device *dev,size_t size); +drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size);Quoted 21 lines
Quoted 12 lines
Quoted 11 lines
include/drm/drm_gem_cma_helper.h +1
-1/** * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual @@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. */ #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ .dumb_create = drm_gem_cma_dumb_create, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer_______________________________________________
dri-devel mailing list
dri-devel at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 14 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20200605/18d1911a/attachment-0001.sig>
Thomas Zimmermann
maintainerPATCH v3 2/43 drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro
In reply to Thomas ZimmermannRename the macro to DRM_GEM_CMA_DRIVER_OPS_VMAP to align naming with SHMEM helpers and drm_gem_cma_prime_import_sg_table_vmap(). An variant of the macro is provided for drivers that override the default .dumb_create callback. Adapt drivers to the changes.
v3:
* rename macro to signal implicit vmap on imported buffers
v2:
* provide DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +-- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- drivers/gpu/drm/tiny/hx8357d.c | 2 +- drivers/gpu/drm/tiny/ili9225.c | 2 +- drivers/gpu/drm/tiny/ili9341.c | 2 +- drivers/gpu/drm/tiny/ili9486.c | 2 +- drivers/gpu/drm/tiny/mi0283qt.c | 2 +- drivers/gpu/drm/tiny/repaper.c | 2 +- drivers/gpu/drm/tiny/st7586.c | 2 +- drivers/gpu/drm/tiny/st7735r.c | 2 +- include/drm/drm_gem_cma_helper.h | 30 ++++++++++++++++++++++++---- 12 files changed, 37 insertions(+), 16 deletions(-)
drivers/gpu/drm/drm_gem_cma_helper.c +1 -1
@@ -620,7 +620,7 @@ EXPORT_SYMBOL(drm_gem_cma_create_object_default_funcs);* address set. This address is released when the object is freed. * * This function can be used as the &drm_driver.gem_prime_import_sg_table -* callback. The DRM_GEM_CMA_VMAP_DRIVER_OPS() macro provides a shortcut to set +* callback. The &DRM_GEM_CMA_DRIVER_OPS_VMAP macro provides a shortcut to set * the necessary DRM driver operations. * * Returns:
drivers/gpu/drm/sun4i/sun4i_drv.c +1 -2
@@ -52,8 +52,7 @@ static struct drm_driver sun4i_drv_driver = { .minor = 0,/* GEM Operations */ -DRM_GEM_CMA_VMAP_DRIVER_OPS , - .dumb_create = drm_sun4i_gem_dumb_create, + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(drm_sun4i_gem_dumb_create), };static int sun4i_drv_bind (struct device *dev)
drivers/gpu/drm/tidss/tidss_drv.c +1 -1
@@ -112,7 +112,7 @@ static struct drm_driver tidss_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &tidss_fops, .release = tidss_release, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .name = "tidss", .desc = "TI Keystone DSS", .date = "20180215",
drivers/gpu/drm/tiny/hx8357d.c +1 -1
@@ -196,7 +196,7 @@ DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops);static struct drm_driver hx8357d_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &hx8357d_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="hx8357d" , .desc ="HX8357D" ,
drivers/gpu/drm/tiny/ili9225.c +1 -1
@@ -346,7 +346,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops);static struct drm_driver ili9225_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &ili9225_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .name ="ili9225" , .desc ="Ilitek ILI9225" , .date ="20171106" ,
drivers/gpu/drm/tiny/ili9341.c +1 -1
@@ -152,7 +152,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops);static struct drm_driver ili9341_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &ili9341_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="ili9341" , .desc ="Ilitek ILI9341" ,
drivers/gpu/drm/tiny/ili9486.c +1 -1
@@ -165,7 +165,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9486_fops);static struct drm_driver ili9486_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &ili9486_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="ili9486" , .desc ="Ilitek ILI9486" ,
drivers/gpu/drm/tiny/mi0283qt.c +1 -1
@@ -156,7 +156,7 @@ DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops);static struct drm_driver mi0283qt_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &mi0283qt_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="mi0283qt" , .desc ="Multi-Inno MI0283QT" ,
drivers/gpu/drm/tiny/repaper.c +1 -1
@@ -946,7 +946,7 @@ DEFINE_DRM_GEM_CMA_FOPS(repaper_fops);static struct drm_driver repaper_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &repaper_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .name ="repaper" , .desc ="Pervasive Displays RePaper e-ink panels" , .date ="20170405" ,
drivers/gpu/drm/tiny/st7586.c +1 -1
@@ -285,7 +285,7 @@ DEFINE_DRM_GEM_CMA_FOPS(st7586_fops);static struct drm_driver st7586_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &st7586_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="st7586" , .desc ="Sitronix ST7586" ,
drivers/gpu/drm/tiny/st7735r.c +1 -1
@@ -157,7 +157,7 @@ DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops);static struct drm_driver st7735r_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &st7735r_fops, -DRM_GEM_CMA_VMAP_DRIVER_OPS , +DRM_GEM_CMA_DRIVER_OPS_VMAP , .debugfs_init = mipi_dbi_debugfs_init, .name ="st7735r" , .desc ="Sitronix ST7735R" ,
include/drm/drm_gem_cma_helper.h +26 -4
@@ -110,21 +110,43 @@ struct drm_gem_object * drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);/** -* DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual -* address on the buffer +* DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE - CMA GEM driver operations +* ensuring a virtual address +* on the buffer +* @dumb_create_func: callback function for .dumb_create * * This macro provides a shortcut for setting the default GEM operations in the * &drm_driver structure for drivers that need the virtual address also on * imported buffers. +* +* This macro is a variant of DRM_GEM_CMA_DRIVER_OPS_VMAP for drivers that +* override the default implementation of &struct rm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. */ -#define DRM_GEM_CMA_VMAP_DRIVER_OPS \ +#define DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (dumb_create_func) \ .gem_create_object = drm_gem_cma_create_object_default_funcs, \ - .dumb_create = drm_gem_cma_dumb_create, \ + .dumb_create = (dumb_create_func), \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table_vmap, \ .gem_prime_mmap = drm_gem_prime_mmap +/** +* DRM_GEM_CMA_DRIVER_OPS_VMAP - CMA GEM driver operations ensuring a virtual +* address on the buffer +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure for drivers that need the virtual address also on +* imported buffers. +* +* Drivers that come with their own implementation of +* &struct drm_driver.dumb_create should use +* DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. Use +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +*/ +#define DRM_GEM_CMA_DRIVER_OPS_VMAP \ + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(drm_gem_cma_dumb_create) +struct drm_gem_object * drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *drm, struct dma_buf_attachment *attach,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 3/43 drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functions
In reply to Thomas ZimmermannThe macro to DRM_GEM_CMA_DRIVER_OPS sets GEM callbacks in struct drm_driver to their defaults for CMA. An variant of the macro is provided for drivers that override the default .dumb_create callback. Adapt drivers to the changes.
--- include/drm/drm_gem_cma_helper.h | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)
include/drm/drm_gem_cma_helper.h +43 -3
@@ -109,6 +109,42 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr);struct drm_gem_object *drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size); +/** +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE - CMA GEM driver operations +* @dumb_create_func: callback function for .dumb_create +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure. +* +* This macro is a variant of DRM_GEM_CMA_DRIVER_OPS for drivers that +* override the default implementation of &struct rm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address +* on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. +*/ +#define DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (dumb_create_func) \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ + .dumb_create = (dumb_create_func), \ + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, \ + .gem_prime_mmap = drm_gem_cma_prime_mmap + +/** +* DRM_GEM_CMA_DRIVER_OPS - CMA GEM driver operations +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure. +* +* Drivers that come with their own implementation of +* &struct drm_driver.dumb_create should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address +* on imported buffers should use DRM_GEM_CMA_DRIVER_OPS_VMAP instead. +*/ +#define DRM_GEM_CMA_DRIVER_OPS \ + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(drm_gem_cma_dumb_create) +/** * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE - CMA GEM driver operations * ensuring a virtual address
@@ -120,8 +156,10 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. * * This macro is a variant of DRM_GEM_CMA_DRIVER_OPS_VMAP for drivers that -* override the default implementation of &struct rm_driver.dumb_create. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* override the default implementation of &struct drm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (dumb_create_func) \ .gem_create_object = drm_gem_cma_create_object_default_funcs, \
@@ -142,7 +180,9 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* Drivers that come with their own implementation of * &struct drm_driver.dumb_create should use * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use DRM_GEM_CMA_DRIVER_OPS +* instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP \ DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(drm_gem_cma_dumb_create)
Signature · 1 line
2.26.2
Re: [PATCH v3 03/43] drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functions
Hi Thomas,
Thank you for the patch.
Quoted 2 lines · Thomas Zimmermann
The macro to
DRM_GEM_CMA_DRIVER_OPSsets GEM callbacks in structdrm_driverto their defaults for CMA. An variant of the macro is provided for drivers
s/An variant/A variant/
Quoted 24 lines
that override the default .dumb_create callback. Adapt drivers to the changes.
Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Acked-by Emil Velikov <[email protected]>--- include/drm/drm_gem_cma_helper.h | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)include/drm/drm_gem_cma_helper.h +6
-0@@ -109,6 +109,42 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr);struct drm_gem_object *drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size); +/** +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE - CMA GEM driver operations +* @dumb_create_func: callback function for .dumb_create +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure.
include/drm/drm_gem_cma_helper.h void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr); · line 127
Quoted 10 lines
include/drm/drm_gem_cma_helper.h +10
-0+* +* This macro is a variant of DRM_GEM_CMA_DRIVER_OPS for drivers that +* override the default implementation of &struct rm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address +* on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. +*/ +#define DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (dumb_create_func) \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ + .dumb_create = (dumb_create_func), \
Do we need parentheses here ?
Quoted 48 lines
include/drm/drm_gem_cma_helper.h +27
-3+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, \ + .gem_prime_mmap = drm_gem_cma_prime_mmap + +/** +* DRM_GEM_CMA_DRIVER_OPS - CMA GEM driver operations +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure. +* +* Drivers that come with their own implementation of +* &struct drm_driver.dumb_create should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address +* on imported buffers should use DRM_GEM_CMA_DRIVER_OPS_VMAP instead. + */ +#define DRM_GEM_CMA_DRIVER_OPS \ + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(drm_gem_cma_dumb_create) +/** * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE - CMA GEM driver operations * ensuring a virtual address @@ -120,8 +156,10 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. * * This macro is a variant of DRM_GEM_CMA_DRIVER_OPS_VMAP for drivers that -* override the default implementation of &struct rm_driver.dumb_create. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* override the default implementation of &struct drm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (dumb_create_func) \ .gem_create_object = drm_gem_cma_create_object_default_funcs, \@@ -142,7 +180,9 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* Drivers that come with their own implementation of * &struct drm_driver.dumb_create should use * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use DRM_GEM_CMA_DRIVER_OPS +* instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP \ DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(drm_gem_cma_dumb_create)
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerRe: [PATCH v3 03/43] drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functions
Hi
Am 05.06.20 um 10:16 schrieb Laurent Pinchart:
Quoted 38 lines
Hi Thomas,
Thank you for the patch.
Quoted 2 lines · Thomas Zimmermann
The macro to
DRM_GEM_CMA_DRIVER_OPSsets GEM callbacks in structdrm_driverto their defaults for CMA. An variant of the macro is provided for driverss/An variant/A variant/
Quoted 28 lines
that override the default .dumb_create callback. Adapt drivers to the changes.
Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Acked-by Emil Velikov <[email protected]>--- include/drm/drm_gem_cma_helper.h | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)include/drm/drm_gem_cma_helper.h +10
-0@@ -109,6 +109,42 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr);struct drm_gem_object *drm_gem_cma_create_object_default_funcs (struct drm_device *dev,size_t size); +/** +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE - CMA GEM driver operations +* @dumb_create_func: callback function for .dumb_create +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure. +* +* This macro is a variant of DRM_GEM_CMA_DRIVER_OPS for drivers that +* override the default implementation of &struct rm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address
Quoted 8 lines
include/drm/drm_gem_cma_helper.h void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr); · line 127
Quoted 6 lines
include/drm/drm_gem_cma_helper.h +6
-0+* on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. +*/ +#define DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (dumb_create_func) \ + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ + .dumb_create = (dumb_create_func), \Do we need parentheses here ?
That can probably be removed.
Best regards
Thomas
Quoted 50 lines
Quoted 49 lines
include/drm/drm_gem_cma_helper.h +27
-3+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, \ + .gem_prime_mmap = drm_gem_cma_prime_mmap + +/** +* DRM_GEM_CMA_DRIVER_OPS - CMA GEM driver operations +* +* This macro provides a shortcut for setting the default GEM operations in the +* &drm_driver structure. +* +* Drivers that come with their own implementation of +* &struct drm_driver.dumb_create should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. Drivers that require a virtual address +* on imported buffers should use DRM_GEM_CMA_DRIVER_OPS_VMAP instead. + */ +#define DRM_GEM_CMA_DRIVER_OPS \ + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(drm_gem_cma_dumb_create) +/** * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE - CMA GEM driver operations * ensuring a virtual address @@ -120,8 +156,10 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* imported buffers. * * This macro is a variant of DRM_GEM_CMA_DRIVER_OPS_VMAP for drivers that -* override the default implementation of &struct rm_driver.dumb_create. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* override the default implementation of &struct drm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use +* DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (dumb_create_func) \ .gem_create_object = drm_gem_cma_create_object_default_funcs, \@@ -142,7 +180,9 @@ drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);* Drivers that come with their own implementation of * &struct drm_driver.dumb_create should use * DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. Use -* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. +* DRM_GEM_CMA_DRIVER_OPS_VMAP if possible. Drivers that do not require a +* virtual address on imported buffers should use DRM_GEM_CMA_DRIVER_OPS +* instead. */ #define DRM_GEM_CMA_DRIVER_OPS_VMAP \ DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(drm_gem_cma_dumb_create)
Signature · 14 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20200609/8cfb749a/attachment-0001.sig>
Thomas Zimmermann
maintainerPATCH v3 4/43 drm/arc: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/arc/arcpgu_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arc/arcpgu_drv.c +1 -6
@@ -154,16 +154,11 @@ static struct drm_driver arcpgu_drm_driver = { .minor = 0, .patchlevel = 0, .fops = &arcpgu_drm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_print_info = drm_gem_cma_print_info, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = arcpgu_debugfs_init,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 5/43 drm/arc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/arc/arcpgu_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arc/arcpgu_drv.c +1 -6
@@ -154,12 +154,7 @@ static struct drm_driver arcpgu_drm_driver = { .minor = 0, .patchlevel = 0, .fops = &arcpgu_drm_ops, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = arcpgu_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 6/43 drm/arm: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/arm/hdlcd_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -6
@@ -240,16 +240,11 @@ static struct drm_driver hdlcd_driver = { .irq_preinstall = hdlcd_irq_preinstall, .irq_postinstall = hdlcd_irq_postinstall, .irq_uninstall = hdlcd_irq_uninstall, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_print_info = drm_gem_cma_print_info, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = hdlcd_debugfs_init,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 7/43 drm/arm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/arm/hdlcd_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -6
@@ -240,12 +240,7 @@ static struct drm_driver hdlcd_driver = { .irq_preinstall = hdlcd_irq_preinstall, .irq_postinstall = hdlcd_irq_postinstall, .irq_uninstall = hdlcd_irq_uninstall, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = hdlcd_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 8/43 drm/atmel-hlcdc: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +1 -5
@@ -821,14 +821,10 @@ static struct drm_driver atmel_hlcdc_dc_driver = { .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, .irq_uninstall = atmel_hlcdc_dc_irq_uninstall, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = drm_gem_cma_dumb_create, .fops = &fops,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 9/43 drm/atmel-hlcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +1 -6
@@ -821,12 +821,7 @@ static struct drm_driver atmel_hlcdc_dc_driver = { .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, .irq_uninstall = atmel_hlcdc_dc_irq_uninstall, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = drm_gem_cma_dumb_create, +DRM_GEM_CMA_DRIVER_OPS , .fops = &fops, .name = "atmel-hlcdc", .desc = "Atmel HLCD Controller DRM",
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 10/43 drm/fsl-dcu: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +1 -5
@@ -141,14 +141,10 @@ static struct drm_driver fsl_dcu_drm_driver = { .irq_handler = fsl_dcu_drm_irq, .irq_preinstall = fsl_dcu_irq_uninstall, .irq_uninstall = fsl_dcu_irq_uninstall, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = drm_gem_cma_dumb_create, .fops = &fsl_dcu_drm_fops,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 11/43 drm/fsl-dcu: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +1 -6
@@ -141,12 +141,7 @@ static struct drm_driver fsl_dcu_drm_driver = { .irq_handler = fsl_dcu_drm_irq, .irq_preinstall = fsl_dcu_irq_uninstall, .irq_uninstall = fsl_dcu_irq_uninstall, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = drm_gem_cma_dumb_create, +DRM_GEM_CMA_DRIVER_OPS , .fops = &fsl_dcu_drm_fops, .name = "fsl-dcu-drm", .desc = "Freescale DCU DRM",
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 12/43 drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create()
In reply to Thomas ZimmermannThe kirin drivers uses drm_gem_cma_dumb_create_internal() for its .dumb_create implementation. The function is meant for internal use only by drivers that require additional buffer setup.
Kirin does not do an additional setup, so convert it over to drm_gem_cma_dumb_create().
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +1 -1
@@ -923,7 +923,7 @@ static struct drm_driver ade_driver = { .fops = &ade_fops, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = drm_gem_cma_dumb_create_internal, + .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 13/43 drm/hisilicon/kirin: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +1 -5
@@ -921,15 +921,11 @@ DEFINE_DRM_GEM_CMA_FOPS(ade_fops);static struct drm_driver ade_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &ade_fops, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .name ="kirin" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 14/43 drm/hisilicon/kirin: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* use DRM_GEM_CMA_DRIVER_OPS
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +1 -7
@@ -921,13 +921,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ade_fops);static struct drm_driver ade_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &ade_fops, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - +DRM_GEM_CMA_DRIVER_OPS , .name ="kirin" , .desc ="Hisilicon Kirin620 SoC DRM Driver" , .date ="20150718" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 15/43 drm/imx: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/imx/imx-drm-core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +1 -5
@@ -146,16 +146,12 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = {static struct drm_driver imx_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .ioctls = imx_drm_ioctls, .num_ioctls =ARRAY_SIZE (imx_drm_ioctls),
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 16/43 drm/imx: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/imx/imx-drm-core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +1 -7
@@ -146,13 +146,7 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = {static struct drm_driver imx_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , .ioctls = imx_drm_ioctls, .num_ioctls =ARRAY_SIZE (imx_drm_ioctls), .fops = &imx_drm_driver_fops,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 17/43 drm/ingenic: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -5
@@ -520,16 +520,12 @@ static struct drm_driver ingenic_drm_driver_data = { .fops = &ingenic_drm_fops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .irq_handler = ingenic_drm_irq_handler,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 18/43 drm/ingenic: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -8
@@ -519,14 +519,7 @@ static struct drm_driver ingenic_drm_driver_data = { .patchlevel = 0, .fops = &ingenic_drm_fops, - - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + DRM_GEM_CMA_DRIVER_OPS, .irq_handler = ingenic_drm_irq_handler, };
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 19/43 drm/komeda: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +1 -5
@@ -61,15 +61,11 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)static struct drm_driver komeda_kms_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .lastclose = drm_fb_helper_lastclose, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = komeda_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .fops = &komeda_cma_fops, .name ="komeda" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 20/43 drm/komeda: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +1 -6
@@ -61,12 +61,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)static struct drm_driver komeda_kms_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .lastclose = drm_fb_helper_lastclose, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = komeda_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (komeda_gem_cma_dumb_create), .fops = &komeda_cma_fops, .name ="komeda" , .desc ="Arm Komeda Display Processor driver" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 21/43 drm/malidp: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/arm/malidp_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/arm/malidp_drv.c +1 -5
@@ -563,15 +563,11 @@ static void malidp_debugfs_init(struct drm_minor *minor)static struct drm_driver malidp_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = malidp_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = malidp_debugfs_init,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 22/43 drm/malidp: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/arm/malidp_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/arm/malidp_drv.c +1 -6
@@ -563,12 +563,7 @@ static void malidp_debugfs_init(struct drm_minor *minor)static struct drm_driver malidp_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = malidp_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (malidp_dumb_create), #ifdef CONFIG_DEBUG_FS .debugfs_init = malidp_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 23/43 drm/mcde: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/mcde/mcde_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/mcde/mcde_drv.c +1 -5
@@ -228,16 +228,12 @@ static struct drm_driver mcde_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, };
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 24/43 drm/mcde: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/mcde/mcde_drv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/mcde/mcde_drv.c +1 -7
@@ -228,13 +228,7 @@ static struct drm_driver mcde_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + DRM_GEM_CMA_DRIVER_OPS, };static int mcde_drm_bind (struct device *dev)
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 25/43 drm/meson: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/meson/meson_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +1 -5
@@ -99,16 +99,12 @@ static struct drm_driver meson_driver = {/* PRIME Ops */ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap,/* GEM Ops */ + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = meson_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops,/* Misc */ .fops = &fops,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 26/43 drm/meson: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/meson/meson_drv.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +2 -9
@@ -96,15 +96,8 @@ static struct drm_driver meson_driver = {/* IRQ */ .irq_handler = meson_irq, -/* PRIME Ops */ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - -/* GEM Ops */ - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = meson_dumb_create, +/* CMA Ops */ +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (meson_dumb_create),/* Misc */ .fops = &fops,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 27/43 drm/mxsfb: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -5
@@ -356,15 +356,11 @@ static struct drm_driver mxsfb_driver = { .irq_handler = mxsfb_irq_handler, .irq_preinstall = mxsfb_irq_preinstall, .irq_uninstall = mxsfb_irq_preinstall, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .fops = &fops, .name = "mxsfb-drm",
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 28/43 drm/mxsfb: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -6
@@ -356,12 +356,7 @@ static struct drm_driver mxsfb_driver = { .irq_handler = mxsfb_irq_handler, .irq_preinstall = mxsfb_irq_preinstall, .irq_uninstall = mxsfb_irq_preinstall, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , .fops = &fops, .name = "mxsfb-drm", .desc = "MXSFB Controller DRM",
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 29/43 drm/rcar-du: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_drv.c +1 -5
@@ -476,14 +476,10 @@ DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);static struct drm_driver rcar_du_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = rcar_du_dumb_create, .fops = &rcar_du_fops,
Signature · 1 line
2.26.2
Re: [PATCH v3 29/43] drm/rcar-du: Use GEM CMA object functions
Hi Thomas,
Thank you for the patch.
Quoted 8 lines · Thomas Zimmermann
Create GEM objects with
drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in structdrm_driverare cleared. No functional changes are made.Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
Quoted 5 lines
v3:
* convert toDRIVER_OPSmacro in a separate patchSigned-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/gpu/drm/rcar-du/rcar_du_drv.c +1
-5@@ -476,14 +476,10 @@ DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);static struct drm_driver rcar_du_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = rcar_du_dumb_create, .fops = &rcar_du_fops,
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerPATCH v3 30/43 drm/rcar-du: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_drv.c +1 -6
@@ -476,12 +476,7 @@ DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);static struct drm_driver rcar_du_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = rcar_du_dumb_create, +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (rcar_du_dumb_create), .fops = &rcar_du_fops, .name ="rcar-du" , .desc ="Renesas R-Car Display Unit" ,
Signature · 1 line
2.26.2
Re: [PATCH v3 30/43] drm/rcar-du: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
Hi Thomas,
Thank you for the patch.
Quoted 10 lines · Thomas Zimmermann
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEsets the functions in structdrm_driverto their defaults. No functional changes are made.v2:
* update forDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATESigned-off-by Thomas Zimmermann <[email protected]>Tested-by Kieran Bingham <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 22 lines
--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/rcar-du/rcar_du_drv.c +1
-6@@ -476,12 +476,7 @@ DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);static struct drm_driver rcar_du_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = rcar_du_dumb_create, +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (rcar_du_dumb_create), .fops = &rcar_du_fops, .name ="rcar-du" , .desc ="Renesas R-Car Display Unit" ,
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerPATCH v3 31/43 drm/shmobile: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/shmobile/shmob_drm_drv.c +1 -5
@@ -131,14 +131,10 @@ DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);static struct drm_driver shmob_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET , .irq_handler = shmob_drm_irq, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = drm_gem_cma_dumb_create, .fops = &shmob_drm_fops,
Signature · 1 line
2.26.2
Re: [PATCH v3 31/43] drm/shmobile: Use GEM CMA object functions
Hi Thomas,
Thank you for the patch.
Quoted 8 lines · Thomas Zimmermann
Create GEM objects with
drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in structdrm_driverare cleared. No functional changes are made.Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
Quoted 5 lines
v3:
* convert toDRIVER_OPSmacro in a separate patchSigned-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 27 lines
--- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/gpu/drm/shmobile/shmob_drm_drv.c +1
-5@@ -131,14 +131,10 @@ DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);static struct drm_driver shmob_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET , .irq_handler = shmob_drm_irq, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .dumb_create = drm_gem_cma_dumb_create, .fops = &shmob_drm_fops,Signature · 1 line
2.26.2
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerPATCH v3 32/43 drm/shmobile: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/shmobile/shmob_drm_drv.c +1 -6
@@ -131,12 +131,7 @@ DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);static struct drm_driver shmob_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET , .irq_handler = shmob_drm_irq, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = drm_gem_cma_dumb_create, +DRM_GEM_CMA_DRIVER_OPS , .fops = &shmob_drm_fops, .name ="shmob-drm" , .desc ="Renesas SH Mobile DRM" ,
Signature · 1 line
2.26.2
Re: [PATCH v3 32/43] drm/shmobile: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
Hi Thomas,
Thank you for the patch.
Quoted 5 lines · Thomas Zimmermann
DRM_GEM_CMA_DRIVER_OPSsets the functions in structdrm_driverto their defaults. No functional changes are made.Signed-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 22 lines
--- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/shmobile/shmob_drm_drv.c +1
-6@@ -131,12 +131,7 @@ DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);static struct drm_driver shmob_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET , .irq_handler = shmob_drm_irq, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .dumb_create = drm_gem_cma_dumb_create, +DRM_GEM_CMA_DRIVER_OPS , .fops = &shmob_drm_fops, .name ="shmob-drm" , .desc ="Renesas SH Mobile DRM" ,
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerPATCH v3 33/43 drm/stm: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/stm/drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/stm/drv.c +1 -5
@@ -62,15 +62,11 @@ static struct drm_driver drv_driver = { .minor = 0, .patchlevel = 0, .fops = &drv_driver_fops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = stm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, };
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 34/43 drm/stm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE sets the functions in struct drm_driver to their defaults. No functional changes are made.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/stm/drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/stm/drv.c +1 -6
@@ -62,12 +62,7 @@ static struct drm_driver drv_driver = { .minor = 0, .patchlevel = 0, .fops = &drv_driver_fops, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = stm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(stm_gem_cma_dumb_create), };static int drv_load (struct drm_device *ddev)
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 35/43 drm/sti: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/sti/sti_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/sti/sti_drv.c +1 -5
@@ -132,17 +132,13 @@ DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops);static struct drm_driver sti_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .fops = &sti_driver_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .debugfs_init = sti_drm_dbg_init,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 36/43 drm/sti: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/sti/sti_drv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/sti/sti_drv.c +1 -7
@@ -132,14 +132,8 @@ DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops);static struct drm_driver sti_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, .fops = &sti_driver_fops, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , .debugfs_init = sti_drm_dbg_init,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 37/43 drm/tilcdc: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -6
@@ -496,17 +496,12 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver tilcdc_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .irq_handler = tilcdc_irq, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_print_info = drm_gem_cma_print_info, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init,
Signature · 1 line
2.26.2
Re: [PATCH v3 37/43] drm/tilcdc: Use GEM CMA object functions
Quoted 8 lines · Thomas Zimmermann
Create GEM objects with
drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in structdrm_driverare cleared. No functional changes are made.Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
Quoted 5 lines
v3:
* convert toDRIVER_OPSmacro in a separate patchSigned-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 28 lines
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/tilcdc/tilcdc_drv.c +1
-6@@ -496,17 +496,12 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver tilcdc_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .irq_handler = tilcdc_irq, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_print_info = drm_gem_cma_print_info, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init,
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Thomas Zimmermann
maintainerPATCH v3 38/43 drm/tilcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -7
@@ -496,13 +496,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver tilcdc_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .irq_handler = tilcdc_irq, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init, #endif
Signature · 1 line
2.26.2
Re: [PATCH v3 38/43] drm/tilcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
Quoted 5 lines · Thomas Zimmermann
DRM_GEM_CMA_DRIVER_OPSsets the functions in structdrm_driverto their defaults. No functional changes are made.Signed-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)drivers/gpu/drm/tilcdc/tilcdc_drv.c +1
-7@@ -496,13 +496,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver tilcdc_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .irq_handler = tilcdc_irq, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init, #endif
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Thomas Zimmermann
maintainerPATCH v3 39/43 drm/tve200: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/tve200/tve200_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/tve200/tve200_drv.c +1 -5
@@ -147,16 +147,12 @@ static struct drm_driver tve200_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, };
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 40/43 drm/tve200: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/tve200/tve200_drv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/tve200/tve200_drv.c +1 -7
@@ -147,13 +147,7 @@ static struct drm_driver tve200_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + DRM_GEM_CMA_DRIVER_OPS, };static int tve200_probe (struct platform_device *pdev)
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 41/43 drm/zte: Use GEM CMA object functions
In reply to Thomas ZimmermannCreate GEM objects with drm_gem_cma_create_object_default_funcs(), which allocates the object and sets CMA's default object functions. Corresponding callbacks in struct drm_driver are cleared. No functional changes are made.
Driver and object-function instances use the same callback functions, with the exception of vunmap. The implementation of vunmap is empty and left out in CMA's default object functions.
v3:
* convert to DRIVER_OPS macro in a separate patch
--- drivers/gpu/drm/zte/zx_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/zte/zx_drm_drv.c +1 -5
@@ -36,15 +36,11 @@ DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops);static struct drm_driver zx_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .fops = &zx_drm_fops, .name ="zx-vou" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 42/43 drm/zte: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS
In reply to Thomas ZimmermannDRM_GEM_CMA_DRIVER_OPS sets the functions in struct drm_driver to their defaults. No functional changes are made.
--- drivers/gpu/drm/zte/zx_drm_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/zte/zx_drm_drv.c +1 -6
@@ -36,12 +36,7 @@ DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops);static struct drm_driver zx_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , - .gem_create_object = drm_gem_cma_create_object_default_funcs, - .dumb_create = drm_gem_cma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , .fops = &zx_drm_fops, .name ="zx-vou" , .desc ="ZTE VOU Controller DRM" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v3 43/43 drm: Remove struct drm_driver.gem_print_info
In reply to Thomas ZimmermannThe .gem_print_info callback in struct drm_driver is obsolete and has no users left. Remove it.
--- drivers/gpu/drm/drm_gem.c | 2 -- include/drm/drm_drv.h | 17 ----------------- 2 files changed, 19 deletions(-)
drivers/gpu/drm/drm_gem.c +0 -2
@@ -1191,8 +1191,6 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,if (obj->funcs && obj->funcs->print_info) obj->funcs->print_info (p, indent, obj); -else if (obj->dev->driver->gem_print_info) - obj->dev->driver->gem_print_info (p, indent, obj); }int drm_gem_pin (struct drm_gem_object *obj)
include/drm/drm_drv.h +0 -17
@@ -353,23 +353,6 @@ struct drm_driver {*/ void (*gem_close_object) (struct drm_gem_object *,struct drm_file *); -/** -* @gem_print_info: -* -* This callback is deprecated in favour of -* &drm_gem_object_funcs.print_info. -* -* If driver subclasses struct &drm_gem_object, it can implement this -* optional hook for printing additional driver specific info. -* -* drm_printf_indent() should be used in the callback passing it the -* indent argument. -* -* This callback is called from drm_gem_print_info(). -*/ -void (*gem_print_info)(struct drm_printer *p,unsigned int indent, -const struct drm_gem_object *obj); -/** * @gem_create_object: constructor for gem objects *
Signature · 1 line
2.26.2
Re: [PATCH v3 43/43] drm: Remove struct drm_driver.gem_print_info
Hi Thomas,
Thank you for the patch.
Quoted 2 lines · Thomas Zimmermann
The .gem_print_info callback in struct
drm_driveris obsolete and has no users left. Remove it.
I like code removal :-) Looking forward to the removal of more GEM-related fields from struct drm_driver.
Quoted 2 lines
Signed-off-by Thomas Zimmermann <[email protected]>Suggested-by Emil Velikov <[email protected]>
Quoted 46 lines
--- drivers/gpu/drm/drm_gem.c | 2 -- include/drm/drm_drv.h | 17 ----------------- 2 files changed, 19 deletions(-)drivers/gpu/drm/drm_gem.c +0
-2@@ -1191,8 +1191,6 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,if (obj->funcs && obj->funcs->print_info) obj->funcs->print_info (p, indent, obj); -else if (obj->dev->driver->gem_print_info) - obj->dev->driver->gem_print_info (p, indent, obj); }int drm_gem_pin (struct drm_gem_object *obj)include/drm/drm_drv.h +0
-17@@ -353,23 +353,6 @@ struct drm_driver {*/ void (*gem_close_object) (struct drm_gem_object *,struct drm_file *); -/** -* @gem_print_info: -* -* This callback is deprecated in favour of -* &drm_gem_object_funcs.print_info. -* -* If driver subclasses struct &drm_gem_object, it can implement this -* optional hook for printing additional driver specific info. -* -* drm_printf_indent() should be used in the callback passing it the -* indent argument. -* -* This callback is called from drm_gem_print_info(). -*/ -void (*gem_print_info)(struct drm_printer *p,unsigned int indent, -const struct drm_gem_object *obj); -/** * @gem_create_object: constructor for gem objects *
Signature · 3 lines
Regards, Laurent Pinchart
Hi Thomas,
Quoted 32 lines · Thomas Zimmermann
Most of the CMA-based drivers use the default implementation for the callbacks in struct
drm_driver. With this patch, these interfaces are initialized with a common helper macro and GEM object functions replace several deprecated interfaces.To address Laurent's comment on the amount of changes per patch, I re- organized the series.
1) There are now
DRIVER_OPSmacros for drivers that require a virtual address on imported buffers, and macros for drivers that don't. Therefore, drivers don't switch todrm_gem_cma_prime_import_sg_table_vmap()implicitly when they begin using theDRIVER_OPSmacro.2) I split each driver's patch into two: the first converts the driver to GEM CMA object functions, the second introduces the
DRIVER_OPSmacro. Neither patch should result in a functional change. I kept existing R-b and A-b tags on both patches. Existing Tested-by tags are only on the final patch, as that's closest to what has been tested.3) I dropped the conversion to
drm_gem_prime_mmap()from the patchset. As part of this change, the CMA object functions could provide an mmap function, which is worth it's own series. The patch for aspeed requiresdrm_gem_prime_mmap(), so I removed it from the series.Patches 1 to 3 update the existing macro and helper to similar naming as with SHMEM, add a new
DRIVER_OPSmacro, and add helpers for drivers that override the default implementation for .dumb_create(). The remaining patches up to the final one convert the drivers. The kirin driver also changes to the defaultdumb_createfunction. The final patch deletes .gem_print_info from structdrm_driver.
Quoted 3 lines
I don't have much of the hardware, so it's only compile-tested on aarch64, arm and x86-64 only. Several patches have Tested-by tags.
For the whole updated series:
-Emil