Commit 06d66201 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro 



Rename 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

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605073247.4057-3-tzimmermann@suse.de
parent 26eb603b

drivers/gpu/drm/drm_gem_cma_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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",