From: Thomas Zimmermann <tzimmermann@suse.de>
To: abrodkin@synopsys.com, airlied@linux.ie, daniel@ffwll.ch,
james.qian.wang@arm.com, liviu.dudau@arm.com,
mihail.atanassov@arm.com, brian.starkey@arm.com, joel@jms.id.au,
andrew@aj.id.au, sam@ravnborg.org, bbrezillon@kernel.org,
nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com,
ludovic.desroches@microchip.com,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
stefan@agner.ch, alison.wang@nxp.com, xinliang.liu@linaro.org,
zourongrong@gmail.com, john.stultz@linaro.org,
kong.kongxinwei@hisilicon.com, puck.chen@hisilicon.com,
p.zabel@pengutronix.de, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, paul@crapouillou.net,
linus.walleij@linaro.org, narmstrong@baylibre.com,
khilman@baylibre.com, marex@denx.de,
laurent.pinchart@ideasonboard.com,
kieran.bingham+renesas@ideasonboard.com,
benjamin.gaignard@linaro.org, vincent.abriou@st.com,
yannick.fertre@st.com, philippe.cornu@st.com,
mcoquelin.stm32@gmail.com, alexandre.torgue@st.com,
wens@csie.org, jsarha@ti.com, tomi.valkeinen@ti.com,
noralf@tronnes.org
Cc: linux-arm-kernel@lists.infradead.org,
Thomas Zimmermann <tzimmermann@suse.de>,
linux-aspeed@lists.ozlabs.org, dri-devel@lists.freedesktop.org,
Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH v3 03/43] drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functions
Date: Fri, 5 Jun 2020 09:32:07 +0200 [thread overview]
Message-ID: <20200605073247.4057-4-tzimmermann@suse.de> (raw)
In-Reply-To: <20200605073247.4057-1-tzimmermann@suse.de>
The 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.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
---
include/drm/drm_gem_cma_helper.h | 46 +++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h
index 2cdf333ae585d..5e1e595c0e72d 100644
--- a/include/drm/drm_gem_cma_helper.h
+++ b/include/drm/drm_gem_cma_helper.h
@@ -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)
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-06-05 7:33 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 7:32 [PATCH v3 00/43] Convert most CMA-based drivers to GEM object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 01/43] drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_ Thomas Zimmermann
2020-06-05 8:40 ` Laurent Pinchart
2020-06-05 14:15 ` Thomas Zimmermann
2020-06-05 14:23 ` Sam Ravnborg
2020-06-05 14:40 ` Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 02/43] drm/cma-helper: Rework DRM_GEM_CMA_VMAP_DRIVER_OPS macro Thomas Zimmermann
2020-06-05 7:32 ` Thomas Zimmermann [this message]
2020-06-05 8:16 ` [PATCH v3 03/43] drm/cma-helper: Add DRM_GEM_CMA_DRIVER_OPS to set default GEM CMA functions Laurent Pinchart
2020-06-09 9:45 ` Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 04/43] drm/arc: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 05/43] drm/arc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 06/43] drm/arm: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 07/43] drm/arm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 08/43] drm/atmel-hlcdc: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 09/43] drm/atmel-hlcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 10/43] drm/fsl-dcu: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 11/43] drm/fsl-dcu: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 12/43] drm/hisilicon/kirin: Set .dumb_create to drm_gem_cma_dumb_create() Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 13/43] drm/hisilicon/kirin: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 14/43] drm/hisilicon/kirin: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 15/43] drm/imx: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 16/43] drm/imx: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 17/43] drm/ingenic: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 18/43] drm/ingenic: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 19/43] drm/komeda: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 20/43] drm/komeda: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 21/43] drm/malidp: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 22/43] drm/malidp: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 23/43] drm/mcde: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 24/43] drm/mcde: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 25/43] drm/meson: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 26/43] drm/meson: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 27/43] drm/mxsfb: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 28/43] drm/mxsfb: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 29/43] drm/rcar-du: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 8:23 ` Laurent Pinchart
2020-06-05 7:32 ` [PATCH v3 30/43] drm/rcar-du: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE Thomas Zimmermann
2020-06-05 8:14 ` Laurent Pinchart
2020-06-05 7:32 ` [PATCH v3 31/43] drm/shmobile: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 8:20 ` Laurent Pinchart
2020-06-05 7:32 ` [PATCH v3 32/43] drm/shmobile: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 8:13 ` Laurent Pinchart
2020-06-05 7:32 ` [PATCH v3 33/43] drm/stm: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 34/43] drm/stm: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 35/43] drm/sti: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 36/43] drm/sti: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 37/43] drm/tilcdc: Use GEM CMA object functions Thomas Zimmermann
2020-06-24 9:03 ` Jyri Sarha
2020-06-05 7:32 ` [PATCH v3 38/43] drm/tilcdc: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-24 9:03 ` Jyri Sarha
2020-06-05 7:32 ` [PATCH v3 39/43] drm/tve200: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 40/43] drm/tve200: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 41/43] drm/zte: Use GEM CMA object functions Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 42/43] drm/zte: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS Thomas Zimmermann
2020-06-05 7:32 ` [PATCH v3 43/43] drm: Remove struct drm_driver.gem_print_info Thomas Zimmermann
2020-06-05 8:37 ` Laurent Pinchart
2020-06-05 15:40 ` [PATCH v3 00/43] Convert most CMA-based drivers to GEM object functions Emil Velikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605073247.4057-4-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=abrodkin@synopsys.com \
--cc=airlied@linux.ie \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=alison.wang@nxp.com \
--cc=andrew@aj.id.au \
--cc=bbrezillon@kernel.org \
--cc=benjamin.gaignard@linaro.org \
--cc=brian.starkey@arm.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=festevam@gmail.com \
--cc=james.qian.wang@arm.com \
--cc=joel@jms.id.au \
--cc=john.stultz@linaro.org \
--cc=jsarha@ti.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=kong.kongxinwei@hisilicon.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-imx@nxp.com \
--cc=liviu.dudau@arm.com \
--cc=ludovic.desroches@microchip.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marex@denx.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=mihail.atanassov@arm.com \
--cc=mripard@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=nicolas.ferre@microchip.com \
--cc=noralf@tronnes.org \
--cc=p.zabel@pengutronix.de \
--cc=paul@crapouillou.net \
--cc=philippe.cornu@st.com \
--cc=puck.chen@hisilicon.com \
--cc=s.hauer@pengutronix.de \
--cc=sam@ravnborg.org \
--cc=shawnguo@kernel.org \
--cc=stefan@agner.ch \
--cc=tomi.valkeinen@ti.com \
--cc=vincent.abriou@st.com \
--cc=wens@csie.org \
--cc=xinliang.liu@linaro.org \
--cc=yannick.fertre@st.com \
--cc=zourongrong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).