drm: Convert most CMA-based drivers to GEM object functions
Subsystems (31)
Thomas Zimmermann
maintainerv2 cover drm: 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.
The first patch updates the existing macro to similar naming as with SHMEM and adds a helper for drivers that override the default implementation for .dumb_create(). The remaining patches convert the drivers. The aspeed driver already uses GEM object functions and only changes to the initializer macro. The kirin driver also changes to the default dumb_create function.
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. The aspeed driver has used the implemented scheme for a while.
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 (23):
drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro drm/arc: Use GEM CMA object functions
drm/arm: Use GEM CMA object functions
drm/aspeed: Set driver CMA functions with DRM_GEM_CMA_DRIVER_OPS drm/atmel-hlcdc: Use GEM CMA object functions drm/fsl-dcu: Use GEM CMA object functions drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create() drm/hisilicon/kirin: Use GEM CMA object functions drm/imx: Use GEM CMA object functions
drm/ingenic: Use GEM CMA object functions
drm/komeda: Use GEM CMA object functions
drm/malidp: Use GEM CMA object functions
drm/mcde: Use GEM CMA object functions
drm/meson: Use GEM CMA object functions
drm/mxsfb: Use GEM CMA object functions
drm/rcar-du: Use GEM CMA object functions
drm/shmobile: Use GEM CMA object functions
drm/stm: Use GEM CMA object functions
drm/sti: Use GEM CMA object functions
drm/tilcdc: Use GEM CMA object functions
drm/tv200: Use GEM CMA object functions
drm/zte: Use GEM CMA object functions
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 | 7 +---- 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 | 2 +- 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 | 30 ++++++++++++++++--- 34 files changed, 58 insertions(+), 245 deletions(-)
--
2.26.2
Thomas Zimmermann
maintainerPATCH v2 1/23 drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro
Rename the macro to DRM_GEM_CMA_DRIVER_OPS to align with SHMEM helpers. An internal version is provided for drivers that override the default .dumb_create callback. Adapt drivers to the changes.
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_cma_gem_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 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_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 , .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 , .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 , .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 , .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 , .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 , .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 , .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 , .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 , .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_cma_gem_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_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 for drivers that +* override the default implementation of &struct rm_driver.dumb_create. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. */ -#define DRM_GEM_CMA_VMAP_DRIVER_OPS \ +#define DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (dumb_create_func) \ .gem_create_object = drm_cma_gem_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 - 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_WITH_DUMB_CREATE() instead. Use +* DRM_GEM_CMA_DRIVER_OPS if possible. +*/ +#define DRM_GEM_CMA_DRIVER_OPS \ + DRM_GEM_CMA_DRIVER_OPS_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 v2 2/23 drm/arc: Use GEM CMA object functions
In reply to Thomas ZimmermannThe arc driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/arc/arcpgu_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/arc/arcpgu_drv.c +1 -11
@@ -154,17 +154,7 @@ static struct drm_driver arcpgu_drm_driver = { .minor = 0, .patchlevel = 0, .fops = &arcpgu_drm_ops, - .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, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = arcpgu_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 3/23 drm/arm: Use GEM CMA object functions
In reply to Thomas ZimmermannThe arm driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/arm/hdlcd_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -11
@@ -240,17 +240,7 @@ 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, - .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, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = hdlcd_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 4/23 drm/aspeed: Set driver 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/aspeed/aspeed_gfx_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -6
@@ -188,12 +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, - .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_prime_mmap, +DRM_GEM_CMA_DRIVER_OPS , .fops = &fops, .name ="aspeed-gfx-drm" , .desc ="ASPEED GFX DRM" ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 5/23 drm/atmel-hlcdc: Use GEM CMA object functions
In reply to Thomas ZimmermannThe atmel-hlcdc driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +1 -10
@@ -821,16 +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_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, - .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 v2 6/23 drm/fsl-dcu: Use GEM CMA object functions
In reply to Thomas ZimmermannThe fsl-dcu driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +1 -10
@@ -141,16 +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_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, - .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 v2 7/23 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
Re: [PATCH v2 07/23] drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create()
Quoted 5 lines · Thomas Zimmermann
The 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.
Quoted 8 lines
Kirin does not do an additional setup, so convert it over to
drm_gem_cma_dumb_create().Signed-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Xu YiPing <[email protected]>Cc Rongrong Zou <[email protected]>Cc Xinliang Liu <[email protected]>
Thanks for sending this out! Works fine on my HiKey board.
thanks
-john
Thomas Zimmermann
maintainerPATCH v2 8/23 drm/hisilicon/kirin: Use GEM CMA object functions
In reply to Thomas ZimmermannThe kirin driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* use DRM_GEM_CMA_DRIVER_OPS
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +1 -11
@@ -921,17 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, - +DRM_GEM_CMA_DRIVER_OPS , .name ="kirin" , .desc ="Hisilicon Kirin620 SoC DRM Driver" , .date ="20150718" ,
Signature · 1 line
2.26.2
Re: [PATCH v2 08/23] drm/hisilicon/kirin: Use GEM CMA object functions
Quoted 13 lines · Thomas Zimmermann
The kirin driver uses the default implementation for CMA functions. The
DRM_GEM_CMA_DRIVER_OPSmacro now sets these defaults in structdrm_driver.Using
DRM_GEM_CMA_DRIVER_OPSintroduces several changes: the driver now sets .gem_create_object todrm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in structdrm_driverare cleared. Prime import now usesdrm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed bydrm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
Quoted 8 lines
v2:
* useDRM_GEM_CMA_DRIVER_OPSSigned-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Xu YiPing <[email protected]>Cc Rongrong Zou <[email protected]>Cc Xinliang Liu <[email protected]>
Thanks for sending this out! Works fine on my HiKey board.
thanks
-john
Thomas Zimmermann
maintainerPATCH v2 9/23 drm/imx: Use GEM CMA object functions
In reply to Thomas ZimmermannThe imx driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/imx/imx-drm-core.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +1 -11
@@ -146,17 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, +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 v2 10/23 drm/ingenic: Use GEM CMA object functions
In reply to Thomas ZimmermannThe ingenic driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -12
@@ -519,18 +519,7 @@ static struct drm_driver ingenic_drm_driver_data = { .patchlevel = 0, .fops = &ingenic_drm_fops, - - .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, + DRM_GEM_CMA_DRIVER_OPS, .irq_handler = ingenic_drm_irq_handler, };
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 11/23 drm/komeda: Use GEM CMA object functions
In reply to Thomas ZimmermannThe komeda driver uses the default implementation for CMA functions; except for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() macro now sets these defaults and .dumb_create in struct drm_driver. All remaining operations are provided by CMA GEM object functions.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +1 -10
@@ -61,16 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, +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 v2 12/23 drm/malidp: Use GEM CMA object functions
In reply to Thomas ZimmermannThe malidp driver uses the default implementation for CMA functions; except for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() macro now sets these defaults and .dumb_create in struct drm_driver.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/arm/malidp_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/arm/malidp_drv.c +1 -10
@@ -563,16 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, +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 v2 13/23 drm/mcde: Use GEM CMA object functions
In reply to Thomas ZimmermannThe mcde driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver. All remaining operations are provided by CMA GEM object functions.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/mcde/mcde_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/mcde/mcde_drv.c +1 -11
@@ -228,17 +228,7 @@ static struct drm_driver mcde_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, - .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, + DRM_GEM_CMA_DRIVER_OPS, };static int mcde_drm_bind (struct device *dev)
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 14/23 drm/meson: Use GEM CMA object functions
In reply to Thomas ZimmermannThe meson driver uses the default implementation for CMA functions; except for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() macro now sets these defaults and .dumb_create in struct drm_driver.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/meson/meson_drv.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +2 -13
@@ -96,19 +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_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 */ - .dumb_create = meson_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, +/* CMA Ops */ +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (meson_dumb_create),/* Misc */ .fops = &fops,
Signature · 1 line
2.26.2
Re: [PATCH v2 14/23] drm/meson: Use GEM CMA object functions
Quoted 39 lines · Thomas Zimmermann
The meson driver uses the default implementation for CMA functions; except for the .dumb_create callback. The
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE()macro now sets these defaults and .dumb_create in structdrm_driver.By using
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE()the driver now sets .gem_create_object todrm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in structdrm_driverare cleared. Prime import now usesdrm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed bydrm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.v2:
* update forDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATESigned-off-by Thomas Zimmermann <[email protected]>Acked-by Emil Velikov <[email protected]>--- drivers/gpu/drm/meson/meson_drv.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)drivers/gpu/drm/meson/meson_drv.c +0
-8@@ -96,19 +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_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,
drivers/gpu/drm/meson/meson_drv.c static struct drm_driver meson_driver = { · line 103
Quoted 10 lines
drivers/gpu/drm/meson/meson_drv.c +2
-5- -/* GEM Ops */ - .dumb_create = meson_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, +/* CMA Ops */ +DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (meson_dumb_create),/* Misc */ .fops = &fops,
Thomas Zimmermann
maintainerPATCH v2 15/23 drm/mxsfb: Use GEM CMA object functions
In reply to Thomas ZimmermannThe mxsfb driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -10
@@ -356,16 +356,7 @@ 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, - .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, +DRM_GEM_CMA_DRIVER_OPS , .fops = &fops, .name = "mxsfb-drm", .desc = "MXSFB Controller DRM",
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 16/23 drm/rcar-du: Use GEM CMA object functions
In reply to Thomas ZimmermannThe rcar-du driver uses the default implementation for CMA functions; except for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() macro now sets these defaults and .dumb_create in struct drm_driver.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_drv.c +1 -10
@@ -476,16 +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_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, - .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 v2 16/23] drm/rcar-du: Use GEM CMA object functions
Hi Thomas,
Thank you for the patch.
Quoted 4 lines · Thomas Zimmermann
The rcar-du driver uses the default implementation for CMA functions; except for the .dumb_create callback. The
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE()macro now sets these defaults and .dumb_create in structdrm_driver.
Quoted 8 lines
By using
DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE()the driver now sets .gem_create_object todrm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in structdrm_driverare cleared. Prime import now usesdrm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed bydrm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
How is the aspeed driver related to this patch ?
Quoted 3 lines
v2:
* update forDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
As explained in the review of v1, this combines multiple changes in a single patch. Some of those changes are not straightforward to review. It would be easier if they were split in separate patches.
Quoted 29 lines
Signed-off-by Thomas Zimmermann <[email protected]>Tested-by Kieran Bingham <[email protected]>Acked-by Emil Velikov <[email protected]>--- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)drivers/gpu/drm/rcar-du/rcar_du_drv.c +1
-10@@ -476,16 +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_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, - .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 v2 17/23 drm/shmobile: Use GEM CMA object functions
In reply to Thomas ZimmermannThe shmobile driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/shmobile/shmob_drm_drv.c +1 -10
@@ -131,16 +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_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, - .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
Thomas Zimmermann
maintainerPATCH v2 18/23 drm/stm: Use GEM CMA object functions
In reply to Thomas ZimmermannThe stm driver uses the default implementation for CMA functions; except for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() macro now sets these defaults and .dumb_create in struct drm_driver.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
v2:
* update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE
--- drivers/gpu/drm/stm/drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/stm/drv.c +1 -10
@@ -62,16 +62,7 @@ static struct drm_driver drv_driver = { .minor = 0, .patchlevel = 0, .fops = &drv_driver_fops, - .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, + 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 v2 19/23 drm/sti: Use GEM CMA object functions
In reply to Thomas ZimmermannThe sti driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/sti/sti_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/sti/sti_drv.c +1 -11
@@ -132,19 +132,9 @@ 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, - .dumb_create = drm_gem_cma_dumb_create, +DRM_GEM_CMA_DRIVER_OPS , .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, .name =DRIVER_NAME ,
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 20/23 drm/tilcdc: Use GEM CMA object functions
In reply to Thomas ZimmermannThe tilcdc driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -12
@@ -496,18 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_print_info = drm_gem_cma_print_info, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, +DRM_GEM_CMA_DRIVER_OPS , #ifdef CONFIG_DEBUG_FS .debugfs_init = tilcdc_debugfs_init, #endif
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 21/23 drm/tv200: Use GEM CMA object functions
In reply to Thomas ZimmermannThe tve200 driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/tve200/tve200_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/tve200/tve200_drv.c +1 -11
@@ -147,17 +147,7 @@ static struct drm_driver tve200_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, - .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, + DRM_GEM_CMA_DRIVER_OPS, };static int tve200_probe (struct platform_device *pdev)
Signature · 1 line
2.26.2
Thomas Zimmermann
maintainerPATCH v2 22/23 drm/zte: Use GEM CMA object functions
In reply to Thomas ZimmermannThe zte driver uses the default implementation for CMA functions. The DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver.
Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: the driver now sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), which sets CMA GEM object functions. GEM object functions implement the rsp operations where possible. Corresponding interfaces in struct drm_driver are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), which maps the imported buffer upon import. Mmap operations are performed by drm_gem_prime_mmap(), which goes through GEM file operations. These changes have been part of the aspeed driver for some time.
--- drivers/gpu/drm/zte/zx_drm_drv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/zte/zx_drm_drv.c +1 -10
@@ -36,16 +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_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .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, +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 v2 23/23 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