From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Sam Ravnborg <sam@ravnborg.org>,
DRI Development <dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 29/59] drm/mcde: Don't use drm_device->dev_private
Date: Wed, 15 Apr 2020 09:40:04 +0200 [thread overview]
Message-ID: <20200415074034.175360-30-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200415074034.175360-1-daniel.vetter@ffwll.ch>
Upcasting using a container_of macro is more typesafe, faster and
easier for the compiler to optimize.
v2: Move misplaced removal of double-assignment to this patch (Sam)
Reviewed-by: Linus Walleij <linus.walleij@linaro.org> (v1)
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpu/drm/mcde/mcde_display.c | 10 +++++-----
drivers/gpu/drm/mcde/mcde_drm.h | 2 ++
drivers/gpu/drm/mcde/mcde_drv.c | 6 ++----
drivers/gpu/drm/mcde/mcde_dsi.c | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c
index e59907e68854..04e1d38d41f7 100644
--- a/drivers/gpu/drm/mcde/mcde_display.c
+++ b/drivers/gpu/drm/mcde/mcde_display.c
@@ -948,7 +948,7 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe)
{
struct drm_crtc *crtc = &pipe->crtc;
struct drm_device *drm = crtc->dev;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
struct drm_pending_vblank_event *event;
drm_crtc_vblank_off(crtc);
@@ -1020,7 +1020,7 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe,
{
struct drm_crtc *crtc = &pipe->crtc;
struct drm_device *drm = crtc->dev;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
struct drm_pending_vblank_event *event = crtc->state->event;
struct drm_plane *plane = &pipe->plane;
struct drm_plane_state *pstate = plane->state;
@@ -1078,7 +1078,7 @@ static int mcde_display_enable_vblank(struct drm_simple_display_pipe *pipe)
{
struct drm_crtc *crtc = &pipe->crtc;
struct drm_device *drm = crtc->dev;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
u32 val;
/* Enable all VBLANK IRQs */
@@ -1097,7 +1097,7 @@ static void mcde_display_disable_vblank(struct drm_simple_display_pipe *pipe)
{
struct drm_crtc *crtc = &pipe->crtc;
struct drm_device *drm = crtc->dev;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
/* Disable all VBLANK IRQs */
writel(0, mcde->regs + MCDE_IMSCPP);
@@ -1117,7 +1117,7 @@ static struct drm_simple_display_pipe_funcs mcde_display_funcs = {
int mcde_display_init(struct drm_device *drm)
{
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
int ret;
static const u32 formats[] = {
DRM_FORMAT_ARGB8888,
diff --git a/drivers/gpu/drm/mcde/mcde_drm.h b/drivers/gpu/drm/mcde/mcde_drm.h
index 80edd6628979..679c2c4e6d9d 100644
--- a/drivers/gpu/drm/mcde/mcde_drm.h
+++ b/drivers/gpu/drm/mcde/mcde_drm.h
@@ -34,6 +34,8 @@ struct mcde {
struct regulator *vana;
};
+#define to_mcde(dev) container_of(dev, struct mcde, drm)
+
bool mcde_dsi_irq(struct mipi_dsi_device *mdsi);
void mcde_dsi_te_request(struct mipi_dsi_device *mdsi);
extern struct platform_driver mcde_dsi_driver;
diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c
index 22003478db2c..84f3e2dbd77b 100644
--- a/drivers/gpu/drm/mcde/mcde_drv.c
+++ b/drivers/gpu/drm/mcde/mcde_drv.c
@@ -164,7 +164,7 @@ static irqreturn_t mcde_irq(int irq, void *data)
static int mcde_modeset_init(struct drm_device *drm)
{
struct drm_mode_config *mode_config;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
int ret;
if (!mcde->bridge) {
@@ -311,13 +311,11 @@ static int mcde_probe(struct platform_device *pdev)
if (IS_ERR(mcde))
return PTR_ERR(mcde);
drm = &mcde->drm;
- drm->dev_private = mcde;
mcde->dev = dev;
platform_set_drvdata(pdev, drm);
/* Enable continuous updates: this is what Linux' framebuffer expects */
mcde->oneshot_mode = false;
- drm->dev_private = mcde;
/* First obtain and turn on the main power */
mcde->epod = devm_regulator_get(dev, "epod");
@@ -487,7 +485,7 @@ static int mcde_probe(struct platform_device *pdev)
static int mcde_remove(struct platform_device *pdev)
{
struct drm_device *drm = platform_get_drvdata(pdev);
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
component_master_del(&pdev->dev, &mcde_drm_comp_ops);
clk_disable_unprepare(mcde->mcde_clk);
diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c
index 7af5ebb0c436..1baa2324cdb9 100644
--- a/drivers/gpu/drm/mcde/mcde_dsi.c
+++ b/drivers/gpu/drm/mcde/mcde_dsi.c
@@ -1020,7 +1020,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master,
void *data)
{
struct drm_device *drm = data;
- struct mcde *mcde = drm->dev_private;
+ struct mcde *mcde = to_mcde(drm);
struct mcde_dsi *d = dev_get_drvdata(dev);
struct device_node *child;
struct drm_panel *panel = NULL;
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-04-15 7:42 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 7:39 [PATCH 00/59] devm_drm_dev_alloc, v2 Daniel Vetter
2020-04-15 7:39 ` [PATCH 01/59] drm: Add devm_drm_dev_alloc macro Daniel Vetter
2020-04-20 13:36 ` Thomas Zimmermann
2020-04-21 10:45 ` Daniel Vetter
2020-04-21 14:03 ` Thomas Zimmermann
2020-04-21 20:32 ` Sam Ravnborg
2020-04-28 13:06 ` Daniel Vetter
2020-04-15 7:39 ` [PATCH 02/59] drm/vboxvideo: drop DRM_MTRR_WC #define Daniel Vetter
2020-04-15 15:01 ` Hans de Goede
2020-04-15 7:39 ` [PATCH 03/59] drm/vboxvideo: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 15:02 ` Hans de Goede
2020-04-24 16:33 ` Sam Ravnborg
2020-04-15 7:39 ` [PATCH 04/59] drm/vboxvideo: Stop using drm_device->dev_private Daniel Vetter
2020-04-15 15:02 ` Hans de Goede
2020-04-15 7:39 ` [PATCH 05/59] drm/vboxvidoe: use managed pci functions Daniel Vetter
2020-04-15 15:03 ` Hans de Goede
2020-04-15 17:44 ` Daniel Vetter
2020-04-20 13:16 ` Hans de Goede
2020-04-15 17:32 ` Thomas Zimmermann
2020-04-15 7:39 ` [PATCH 06/59] drm/vboxvideo: Use devm_gen_pool_create Daniel Vetter
2020-04-15 15:04 ` Hans de Goede
2020-04-15 7:39 ` [PATCH 07/59] drm/v3d: Don't set drm_device->dev_private Daniel Vetter
2020-04-15 7:39 ` [PATCH 08/59] drm/v3d: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:39 ` [PATCH 09/59] drm/v3d: Delete v3d_dev->dev Daniel Vetter
2020-04-15 7:39 ` [PATCH 10/59] drm/v3d: Delete v3d_dev->pdev Daniel Vetter
2020-04-15 7:39 ` [PATCH 11/59] drm/udl: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:55 ` Thomas Zimmermann
2020-04-24 14:55 ` Sam Ravnborg
2020-04-28 13:18 ` Daniel Vetter
2020-04-15 7:39 ` [PATCH 12/59] drm/udl: don't set drm_device->dev_private Daniel Vetter
2020-04-15 7:39 ` [PATCH 13/59] drm/st7735r: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:39 ` [PATCH 14/59] drm/st7586: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 15/59] drm/repaper: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 16/59] drm/mi0283qt: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 17/59] drm/ili9486: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 18/59] drm/ili9341: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 19/59] drm/ili9225: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 20/59] drm/hx8357d: " Daniel Vetter
2020-04-15 7:39 ` [PATCH 21/59] drm/gm12u320: " Daniel Vetter
2020-04-15 15:04 ` Hans de Goede
2020-04-15 7:39 ` [PATCH 22/59] drm/gm12u320: Don't use drm_device->dev_private Daniel Vetter
2020-04-15 15:05 ` Hans de Goede
2020-04-15 7:39 ` [PATCH 23/59] drm/tidss: Use devm_drm_dev_alloc Daniel Vetter
2020-04-21 11:03 ` Tomi Valkeinen
2020-04-15 7:39 ` [PATCH 24/59] drm/tidss: Don't use drm_device->dev_private Daniel Vetter
2020-04-21 11:05 ` Tomi Valkeinen
2020-04-15 7:40 ` [PATCH 25/59] drm/tidss: Delete tidss->saved_state Daniel Vetter
2020-04-21 11:05 ` Tomi Valkeinen
2020-04-15 7:40 ` [PATCH 26/59] drm/qxl: Use devm_drm_dev_alloc Daniel Vetter
2020-04-24 15:09 ` Sam Ravnborg
2020-04-28 14:00 ` Daniel Vetter
2020-04-28 17:00 ` Sam Ravnborg
2020-04-28 18:04 ` Daniel Vetter
2020-04-15 7:40 ` [PATCH 27/59] drm/qxl: Don't use drm_device->dev_private Daniel Vetter
2020-04-24 15:12 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 28/59] drm/mcde: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 12:20 ` Linus Walleij
2020-04-15 7:40 ` Daniel Vetter [this message]
2020-04-15 7:40 ` [PATCH 30/59] drm/ingenic: " Daniel Vetter
2020-04-15 7:40 ` [PATCH 31/59] drm/ingenic: Don't set drm_device->dev_private Daniel Vetter
2020-04-15 7:40 ` [PATCH 32/59] drm/komeda: use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:40 ` [PATCH 33/59] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:40 ` [PATCH 34/59] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-04-15 7:40 ` [PATCH 35/59] drm/cirrus: Use devm_drm_dev_alloc Daniel Vetter
2020-04-15 7:40 ` [PATCH 36/59] drm/cirrus: Don't use drm_device->dev_private Daniel Vetter
2020-04-15 7:40 ` [PATCH 37/59] drm/cirrus: Move to drm/tiny Daniel Vetter
2020-04-15 8:01 ` Thomas Zimmermann
2020-04-15 8:19 ` Daniel Vetter
2020-04-15 8:46 ` Thomas Zimmermann
2020-04-15 9:31 ` Daniel Vetter
2020-04-21 7:37 ` Gerd Hoffmann
2020-04-24 16:37 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 38/59] drm/i915: Use devm_drm_dev_alloc Daniel Vetter
2020-04-28 18:52 ` Daniel Vetter
2020-04-15 7:40 ` [PATCH 39/59] drm/arcpgu: Switch to devm_drm_dev_alloc Daniel Vetter
2020-04-24 16:43 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 40/59] drm/arcpgu: Stop using drm_device->dev_private Daniel Vetter
2020-04-24 16:46 ` Sam Ravnborg
2020-09-04 13:42 ` Daniel Vetter
2020-09-04 14:42 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 41/59] drm/arcpgu: Delete arcpgu_priv->fb Daniel Vetter
2020-04-24 16:47 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 42/59] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2020-04-24 17:34 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 43/59] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2020-04-24 17:34 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 44/59] drm/arc: Drop surplus connector registration Daniel Vetter
2020-04-24 16:51 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 45/59] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2020-04-24 17:36 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 46/59] drm/arc: Align with simple pipe helpers Daniel Vetter
2020-04-25 12:24 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 47/59] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2020-04-24 17:40 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 48/59] drm/arc: Drop fb/crtc check in arc_pgu_update Daniel Vetter
2020-04-24 17:45 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 49/59] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2020-04-24 17:51 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 50/59] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2020-04-24 17:54 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 51/59] drm/arc: Inline remaining files Daniel Vetter
2020-04-24 17:56 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 52/59] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2020-04-24 17:58 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 53/59] drm/arc: Move to drm/tiny Daniel Vetter
2020-04-15 8:04 ` Thomas Zimmermann
2020-04-15 8:22 ` Daniel Vetter
2020-04-15 9:45 ` Sam Ravnborg
2020-04-15 12:02 ` Alexey Brodkin
2020-04-15 12:20 ` Daniel Vetter
2020-04-28 14:08 ` Daniel Vetter
2020-05-08 13:56 ` Alexey Brodkin
2020-05-08 18:07 ` Daniel Vetter
2020-06-04 8:05 ` Daniel Vetter
2020-06-04 10:38 ` Eugeniy Paltsev
2020-06-04 11:19 ` Daniel Vetter
2020-06-04 19:00 ` Eugeniy Paltsev
2020-06-05 19:55 ` Daniel Vetter
2020-06-09 12:08 ` Eugeniy Paltsev
2020-06-09 13:02 ` Daniel Vetter
2020-07-17 9:04 ` Daniel Vetter
2020-04-15 7:40 ` [PATCH 54/59] drm/aspeed: Drop aspeed_gfx->fbdev Daniel Vetter
2020-04-24 18:00 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 55/59] drm/aspeed: Use devm_drm_dev_alloc Daniel Vetter
2020-04-24 18:02 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 56/59] drm/aspeed: Use managed drmm_mode_config_cleanup Daniel Vetter
2020-04-24 18:10 ` Sam Ravnborg
2020-04-28 14:12 ` Daniel Vetter
2020-04-28 17:03 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 57/59] drm/ast: Use managed pci functions Daniel Vetter
2020-04-15 7:52 ` Thomas Zimmermann
2020-04-15 8:09 ` Daniel Vetter
2020-04-15 8:17 ` Daniel Vetter
2020-04-15 12:23 ` Daniel Vetter
2020-06-11 12:04 ` Thomas Zimmermann
2020-06-16 11:55 ` Daniel Vetter
2020-04-15 7:40 ` [PATCH 58/59] drm/ast: Drop explicit connector register/unregister Daniel Vetter
2020-04-15 7:53 ` Thomas Zimmermann
2020-04-24 18:11 ` Sam Ravnborg
2020-04-15 7:40 ` [PATCH 59/59] drm/bochs: Remove explicit drm_connector_register Daniel Vetter
2020-04-21 7:39 ` Gerd Hoffmann
2020-04-24 18:11 ` Sam Ravnborg
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=20200415074034.175360-30-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sam@ravnborg.org \
/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).