Skip to content

Convert most CMA-based drivers to GEM object functions

Thomas Zimmermann dri-devel linux-arm-kernel linux-aspeed 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest43 patches 14 repliesIn review
  2. v223 patches 4 repliesSuperseded
  3. v121 patches 34 repliesSuperseded

Changes in v3 from the cover letter

* 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

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/43drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_drivers/gpu/drm/aspeed/aspeed_gfx_drv.c drivers/gpu/drm/drm_gem_cma_helper.c include/drm/drm_gem_cma_helper.h+8 -84 replies
2/43drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macrodrivers/gpu/drm/drm_gem_cma_helper.c drivers/gpu/drm/sun4i/sun4i_drv.c drivers/gpu/drm/tidss/tidss_drv.c +9 more+37 -160 replies
3/43drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functionsinclude/drm/drm_gem_cma_helper.h+43 -32 replies
4/43drm/arc: Use GEM CMA object functionsdrivers/gpu/drm/arc/arcpgu_drv.c+1 -60 replies
5/43drm/arc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/arc/arcpgu_drv.c+1 -60 replies
6/43drm/arm: Use GEM CMA object functionsdrivers/gpu/drm/arm/hdlcd_drv.c+1 -60 replies
7/43drm/arm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/arm/hdlcd_drv.c+1 -60 replies
8/43drm/atmel-hlcdc: Use GEM CMA object functionsdrivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c+1 -50 replies
9/43drm/atmel-hlcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c+1 -60 replies
10/43drm/fsl-dcu: Use GEM CMA object functionsdrivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c+1 -50 replies
11/43drm/fsl-dcu: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c+1 -60 replies
12/43drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create()drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c+1 -10 replies
13/43drm/hisilicon/kirin: Use GEM CMA object functionsdrivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c+1 -50 replies
14/43drm/hisilicon/kirin: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c+1 -70 replies
15/43drm/imx: Use GEM CMA object functionsdrivers/gpu/drm/imx/imx-drm-core.c+1 -50 replies
16/43drm/imx: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/imx/imx-drm-core.c+1 -70 replies
17/43drm/ingenic: Use GEM CMA object functionsdrivers/gpu/drm/ingenic/ingenic-drm.c+1 -50 replies
18/43drm/ingenic: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/ingenic/ingenic-drm.c+1 -80 replies
19/43drm/komeda: Use GEM CMA object functionsdrivers/gpu/drm/arm/display/komeda/komeda_kms.c+1 -50 replies
20/43drm/komeda: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEdrivers/gpu/drm/arm/display/komeda/komeda_kms.c+1 -60 replies
21/43drm/malidp: Use GEM CMA object functionsdrivers/gpu/drm/arm/malidp_drv.c+1 -50 replies
22/43drm/malidp: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEdrivers/gpu/drm/arm/malidp_drv.c+1 -60 replies
23/43drm/mcde: Use GEM CMA object functionsdrivers/gpu/drm/mcde/mcde_drv.c+1 -50 replies
24/43drm/mcde: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/mcde/mcde_drv.c+1 -70 replies
25/43drm/meson: Use GEM CMA object functionsdrivers/gpu/drm/meson/meson_drv.c+1 -50 replies
26/43drm/meson: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEdrivers/gpu/drm/meson/meson_drv.c+2 -90 replies
27/43drm/mxsfb: Use GEM CMA object functionsdrivers/gpu/drm/mxsfb/mxsfb_drv.c+1 -50 replies
28/43drm/mxsfb: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/mxsfb/mxsfb_drv.c+1 -60 replies
29/43drm/rcar-du: Use GEM CMA object functionsdrivers/gpu/drm/rcar-du/rcar_du_drv.c+1 -51 reply
30/43drm/rcar-du: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEdrivers/gpu/drm/rcar-du/rcar_du_drv.c+1 -61 reply
31/43drm/shmobile: Use GEM CMA object functionsdrivers/gpu/drm/shmobile/shmob_drm_drv.c+1 -51 reply
32/43drm/shmobile: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/shmobile/shmob_drm_drv.c+1 -61 reply
33/43drm/stm: Use GEM CMA object functionsdrivers/gpu/drm/stm/drv.c+1 -50 replies
34/43drm/stm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATEdrivers/gpu/drm/stm/drv.c+1 -60 replies
35/43drm/sti: Use GEM CMA object functionsdrivers/gpu/drm/sti/sti_drv.c+1 -50 replies
36/43drm/sti: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/sti/sti_drv.c+1 -70 replies
37/43drm/tilcdc: Use GEM CMA object functionsdrivers/gpu/drm/tilcdc/tilcdc_drv.c+1 -61 reply
38/43drm/tilcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/tilcdc/tilcdc_drv.c+1 -71 reply
39/43drm/tve200: Use GEM CMA object functionsdrivers/gpu/drm/tve200/tve200_drv.c+1 -50 replies
40/43drm/tve200: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/tve200/tve200_drv.c+1 -70 replies
41/43drm/zte: Use GEM CMA object functionsdrivers/gpu/drm/zte/zx_drm_drv.c+1 -50 replies
42/43drm/zte: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPSdrivers/gpu/drm/zte/zx_drm_drv.c+1 -60 replies
43/43drm: Remove struct drm_driver.gem_print_infodrivers/gpu/drm/drm_gem.c include/drm/drm_drv.h+0 -191 reply

Reviews trailers per patch

42 of 43 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchSam RavnborgLaurent PinchartEmil VelikovLiviu DudauJohn StultzPaul CercueilLinus WalleijNeil ArmstrongKieran BinghamPhilippe CornuJyri Sarha
SeriesR-b
1/43
2/43R-b R-b A-b
3/43R-b R-b A-b
4/43A-b
5/43A-b
6/43A-b A-b
7/43A-b A-b
8/43R-b A-b
9/43R-b A-b
10/43A-b
11/43A-b
12/43A-b T-b
13/43A-b
14/43A-b T-b
15/43A-b
16/43A-b
17/43A-b R-b
18/43A-b T-b R-b
19/43A-b A-b
20/43A-b A-b
21/43A-b A-b
22/43A-b A-b
23/43A-b R-b
24/43A-b R-b
25/43A-b A-b
26/43A-b A-b
27/43A-b
28/43A-b
29/43R-b A-b
30/43R-b A-b T-b
31/43R-b A-b
32/43R-b A-b
33/43A-b R-b
34/43A-b R-b
35/43A-b
36/43A-b
37/43A-b R-b T-b
38/43A-b R-b T-b
39/43A-b R-b
40/43A-b R-b
41/43A-b
42/43A-b
43/43R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 11 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/43] 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