All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Alexey Brodkin <abrodkin@synopsys.com>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 03/18] drm/arc: Switch to devm_drm_dev_alloc
Date: Fri, 17 Jul 2020 11:04:15 +0200	[thread overview]
Message-ID: <20200717090430.1146256-3-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200717090430.1146256-1-daniel.vetter@ffwll.ch>

- Need to embedded the drm_device, but for now we keep the usual
  pointer chasing.
- No more devm_kzalloc, which fixes a lifetime issues on driver
  remove.
- No more drm_dev_put, that's done by devm_ now.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
---
 drivers/gpu/drm/arc/arcpgu.h     |  1 +
 drivers/gpu/drm/arc/arcpgu_drv.c | 33 +++++++++++++-------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
index 6aac44b953ad..cd9e932f501e 100644
--- a/drivers/gpu/drm/arc/arcpgu.h
+++ b/drivers/gpu/drm/arc/arcpgu.h
@@ -9,6 +9,7 @@
 #define _ARCPGU_H_
 
 struct arcpgu_drm_private {
+	struct drm_device	drm;
 	void __iomem		*regs;
 	struct clk		*clk;
 	struct drm_framebuffer	*fb;
diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
index f164818ec477..68eb4a31c54b 100644
--- a/drivers/gpu/drm/arc/arcpgu_drv.c
+++ b/drivers/gpu/drm/arc/arcpgu_drv.c
@@ -42,18 +42,14 @@ static void arcpgu_setup_mode_config(struct drm_device *drm)
 
 DEFINE_DRM_GEM_CMA_FOPS(arcpgu_drm_ops);
 
-static int arcpgu_load(struct drm_device *drm)
+static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
 {
-	struct platform_device *pdev = to_platform_device(drm->dev);
-	struct arcpgu_drm_private *arcpgu;
+	struct platform_device *pdev = to_platform_device(arcpgu->drm.dev);
 	struct device_node *encoder_node = NULL, *endpoint_node = NULL;
+	struct drm_device *drm = &arcpgu->drm;
 	struct resource *res;
 	int ret;
 
-	arcpgu = devm_kzalloc(&pdev->dev, sizeof(*arcpgu), GFP_KERNEL);
-	if (arcpgu == NULL)
-		return -ENOMEM;
-
 	drm->dev_private = arcpgu;
 
 	arcpgu->clk = devm_clk_get(drm->dev, "pxlclk");
@@ -162,30 +158,28 @@ static struct drm_driver arcpgu_drm_driver = {
 
 static int arcpgu_probe(struct platform_device *pdev)
 {
-	struct drm_device *drm;
+	struct arcpgu_drm_private *arcpgu;
 	int ret;
 
-	drm = drm_dev_alloc(&arcpgu_drm_driver, &pdev->dev);
-	if (IS_ERR(drm))
-		return PTR_ERR(drm);
+	arcpgu = devm_drm_dev_alloc(&pdev->dev, &arcpgu_drm_driver,
+				    struct arcpgu_drm_private, drm);
+	if (IS_ERR(arcpgu))
+		return PTR_ERR(arcpgu);
 
-	ret = arcpgu_load(drm);
+	ret = arcpgu_load(arcpgu);
 	if (ret)
-		goto err_unref;
+		return ret;
 
-	ret = drm_dev_register(drm, 0);
+	ret = drm_dev_register(&arcpgu->drm, 0);
 	if (ret)
 		goto err_unload;
 
-	drm_fbdev_generic_setup(drm, 16);
+	drm_fbdev_generic_setup(&arcpgu->drm, 16);
 
 	return 0;
 
 err_unload:
-	arcpgu_unload(drm);
-
-err_unref:
-	drm_dev_put(drm);
+	arcpgu_unload(&arcpgu->drm);
 
 	return ret;
 }
@@ -196,7 +190,6 @@ static int arcpgu_remove(struct platform_device *pdev)
 
 	drm_dev_unregister(drm);
 	arcpgu_unload(drm);
-	drm_dev_put(drm);
 
 	return 0;
 }
-- 
2.27.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-07-17  9:04 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-17  9:04 [PATCH 01/18] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-07-17  9:04 ` [PATCH 02/18] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-07-17  9:04 ` Daniel Vetter [this message]
2020-07-17  9:04 ` [PATCH 04/18] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2020-07-17  9:04 ` [PATCH 05/18] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2020-07-17  9:04 ` [PATCH 06/18] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2020-07-17  9:04 ` [PATCH 07/18] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2020-07-17  9:04 ` [PATCH 08/18] drm/arc: Drop surplus connector registration Daniel Vetter
2020-07-17  9:04 ` [PATCH 09/18] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2020-07-17  9:04 ` [PATCH 10/18] drm/arc: Align with simple pipe helpers Daniel Vetter
2020-07-17  9:04 ` [PATCH 11/18] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2020-07-17  9:04 ` [PATCH 12/18] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2020-07-17  9:04 ` [PATCH 13/18] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2020-07-17  9:04 ` [PATCH 14/18] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2020-07-17  9:04 ` [PATCH 15/18] drm/arc: Inline remaining files Daniel Vetter
2020-07-17  9:04 ` [PATCH 16/18] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2020-07-17  9:04 ` [PATCH 17/18] drm/arc: Move to drm/tiny Daniel Vetter
2020-07-18  0:33   ` kernel test robot
2020-07-18  0:33     ` kernel test robot
2020-07-17  9:04 ` [PATCH 18/18] drm/aspeed: Use managed drmm_mode_config_cleanup Daniel Vetter
2020-07-17  9:04   ` Daniel Vetter

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=20200717090430.1146256-3-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=abrodkin@synopsys.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.