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>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 08/24] drm/i915/selftests: align more to real device lifetimes
Date: Fri,  4 Sep 2020 16:39:25 +0200	[thread overview]
Message-ID: <20200904143941.110665-9-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200904143941.110665-1-daniel.vetter@ffwll.ch>

The big change is device_add so that device_del can auto-cleanup
devres resources. This allows us to use devm_drm_dev_alloc, which
removes the last user of drm_dev_init.

v2: Rebased

v3: use devres_open/release_group so we can use devm without real
hacks in the driver core or having to create an entire fake bus for
testing drivers. Might want to extract this into helpers eventually,
maybe as a mock_drm_dev_alloc or test_drm_dev_alloc.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 .../gpu/drm/i915/selftests/mock_gem_device.c  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index fbb403edb7a0..164ad1746da9 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -128,12 +128,6 @@ struct drm_i915_private *mock_gem_device(void)
 	pdev = kzalloc(sizeof(*pdev), GFP_KERNEL);
 	if (!pdev)
 		return NULL;
-	i915 = kzalloc(sizeof(*i915), GFP_KERNEL);
-	if (!i915) {
-		kfree(pdev);
-		return NULL;
-	}
-
 	device_initialize(&pdev->dev);
 	pdev->class = PCI_BASE_CLASS_DISPLAY << 16;
 	pdev->dev.release = release_dev;
@@ -146,8 +140,29 @@ struct drm_i915_private *mock_gem_device(void)
 	iommu.priv = (void *)-1;
 	pdev->dev.iommu = &iommu;
 #endif
+	err = device_add(&pdev->dev);
+	if (err) {
+		kfree(pdev);
+		return NULL;
+	}
+
+	if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) {
+		device_del(&pdev->dev);
+		return NULL;
+	}
+
+	i915 = devm_drm_dev_alloc(&pdev->dev, &mock_driver,
+				  struct drm_i915_private, drm);
+	if (err) {
+		pr_err("Failed to allocate mock GEM device: err=%d\n", err);
+		devres_release_group(&pdev->dev, NULL);
+		device_del(&pdev->dev);
+
+		return NULL;
+	}
 
 	pci_set_drvdata(pdev, i915);
+	i915->drm.pdev = pdev;
 
 	dev_pm_domain_set(&pdev->dev, &pm_domain);
 	pm_runtime_enable(&pdev->dev);
@@ -155,16 +170,6 @@ struct drm_i915_private *mock_gem_device(void)
 	if (pm_runtime_enabled(&pdev->dev))
 		WARN_ON(pm_runtime_get_sync(&pdev->dev));
 
-	err = drm_dev_init(&i915->drm, &mock_driver, &pdev->dev);
-	if (err) {
-		pr_err("Failed to initialise mock GEM device: err=%d\n", err);
-		put_device(&pdev->dev);
-		kfree(i915);
-
-		return NULL;
-	}
-	i915->drm.pdev = pdev;
-	drmm_add_final_kfree(&i915->drm, i915);
 
 	i915_params_copy(&i915->params, &i915_modparams);
 
@@ -231,5 +236,8 @@ struct drm_i915_private *mock_gem_device(void)
 
 void mock_destroy_device(struct drm_i915_private *i915)
 {
-	drm_dev_put(&i915->drm);
+	struct device *dev = i915->drm.dev;
+
+	devres_release_group(dev, NULL);
+	device_del(dev);
 }
-- 
2.28.0

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

WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [Intel-gfx] [PATCH 08/24] drm/i915/selftests: align more to real device lifetimes
Date: Fri,  4 Sep 2020 16:39:25 +0200	[thread overview]
Message-ID: <20200904143941.110665-9-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200904143941.110665-1-daniel.vetter@ffwll.ch>

The big change is device_add so that device_del can auto-cleanup
devres resources. This allows us to use devm_drm_dev_alloc, which
removes the last user of drm_dev_init.

v2: Rebased

v3: use devres_open/release_group so we can use devm without real
hacks in the driver core or having to create an entire fake bus for
testing drivers. Might want to extract this into helpers eventually,
maybe as a mock_drm_dev_alloc or test_drm_dev_alloc.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 .../gpu/drm/i915/selftests/mock_gem_device.c  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index fbb403edb7a0..164ad1746da9 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -128,12 +128,6 @@ struct drm_i915_private *mock_gem_device(void)
 	pdev = kzalloc(sizeof(*pdev), GFP_KERNEL);
 	if (!pdev)
 		return NULL;
-	i915 = kzalloc(sizeof(*i915), GFP_KERNEL);
-	if (!i915) {
-		kfree(pdev);
-		return NULL;
-	}
-
 	device_initialize(&pdev->dev);
 	pdev->class = PCI_BASE_CLASS_DISPLAY << 16;
 	pdev->dev.release = release_dev;
@@ -146,8 +140,29 @@ struct drm_i915_private *mock_gem_device(void)
 	iommu.priv = (void *)-1;
 	pdev->dev.iommu = &iommu;
 #endif
+	err = device_add(&pdev->dev);
+	if (err) {
+		kfree(pdev);
+		return NULL;
+	}
+
+	if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) {
+		device_del(&pdev->dev);
+		return NULL;
+	}
+
+	i915 = devm_drm_dev_alloc(&pdev->dev, &mock_driver,
+				  struct drm_i915_private, drm);
+	if (err) {
+		pr_err("Failed to allocate mock GEM device: err=%d\n", err);
+		devres_release_group(&pdev->dev, NULL);
+		device_del(&pdev->dev);
+
+		return NULL;
+	}
 
 	pci_set_drvdata(pdev, i915);
+	i915->drm.pdev = pdev;
 
 	dev_pm_domain_set(&pdev->dev, &pm_domain);
 	pm_runtime_enable(&pdev->dev);
@@ -155,16 +170,6 @@ struct drm_i915_private *mock_gem_device(void)
 	if (pm_runtime_enabled(&pdev->dev))
 		WARN_ON(pm_runtime_get_sync(&pdev->dev));
 
-	err = drm_dev_init(&i915->drm, &mock_driver, &pdev->dev);
-	if (err) {
-		pr_err("Failed to initialise mock GEM device: err=%d\n", err);
-		put_device(&pdev->dev);
-		kfree(i915);
-
-		return NULL;
-	}
-	i915->drm.pdev = pdev;
-	drmm_add_final_kfree(&i915->drm, i915);
 
 	i915_params_copy(&i915->params, &i915_modparams);
 
@@ -231,5 +236,8 @@ struct drm_i915_private *mock_gem_device(void)
 
 void mock_destroy_device(struct drm_i915_private *i915)
 {
-	drm_dev_put(&i915->drm);
+	struct device *dev = i915->drm.dev;
+
+	devres_release_group(dev, NULL);
+	device_del(dev);
 }
-- 
2.28.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-09-04 14:40 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-04 14:39 [PATCH 00/24] drm_managed, leftovers Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 01/24] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-10  1:20   ` Dave Airlie
2020-09-10  1:20     ` [Intel-gfx] " Dave Airlie
2020-09-04 14:39 ` [PATCH 02/24] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 03/24] drm/aspeed: Use managed drmm_mode_config_cleanup Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39   ` Daniel Vetter
2020-09-04 14:39 ` [PATCH 04/24] drm/vgem: Use devm_drm_dev_alloc Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-09 11:01   ` Melissa Wen
2020-09-09 11:01     ` [Intel-gfx] " Melissa Wen
2020-09-09 11:20     ` Daniel Vetter
2020-09-09 11:20       ` [Intel-gfx] " Daniel Vetter
2020-09-09 16:29       ` Melissa Wen
2020-09-09 16:29         ` [Intel-gfx] " Melissa Wen
2020-09-09 12:07   ` [PATCH] " Daniel Vetter
2020-09-09 12:07     ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 05/24] drm/vkms: " Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-08 23:42   ` Melissa Wen
2020-09-08 23:42     ` [Intel-gfx] " Melissa Wen
2020-09-09  9:18   ` [PATCH] " Daniel Vetter
2020-09-09  9:18     ` [Intel-gfx] " Daniel Vetter
2020-09-09  9:22     ` Melissa Wen
2020-09-09  9:22       ` [Intel-gfx] " Melissa Wen
2020-09-04 14:39 ` [PATCH 06/24] drm/xlnx: " Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39   ` Daniel Vetter
2020-09-07  8:22   ` [PATCH] " Daniel Vetter
2020-09-07  8:22     ` [Intel-gfx] " Daniel Vetter
2020-09-07  8:22     ` Daniel Vetter
2020-09-08 19:16     ` Hyun Kwon
2020-09-08 19:16       ` [Intel-gfx] " Hyun Kwon
2020-09-08 19:16       ` Hyun Kwon
2020-09-11  8:47       ` Daniel Vetter
2020-09-11  8:47         ` [Intel-gfx] " Daniel Vetter
2020-09-11  8:47         ` Daniel Vetter
2020-09-04 14:39 ` [PATCH 07/24] drm/i915/selftest: Create mock_destroy_device Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` Daniel Vetter [this message]
2020-09-04 14:39   ` [Intel-gfx] [PATCH 08/24] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-09-11  8:59   ` Maarten Lankhorst
2020-09-11  8:59     ` Maarten Lankhorst
2020-09-11  9:08   ` Matthew Auld
2020-09-11  9:08     ` Matthew Auld
2020-09-04 14:39 ` [PATCH 09/24] drm/dev: Remove drm_dev_init Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 10/24] drm/arc: Switch to devm_drm_dev_alloc Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-10-23 12:31   ` Daniel Vetter
2020-10-23 12:31     ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 11/24] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 15:09   ` Daniel Vetter
2020-09-04 15:09     ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 12/24] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 13/24] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 14/24] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 15/24] drm/arc: Drop surplus connector registration Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 16/24] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 17/24] drm/arc: Align with simple pipe helpers Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 18/24] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 19/24] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 20/24] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 21/24] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 22/24] drm/arc: Inline remaining files Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 23/24] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-04 14:39 ` [PATCH 24/24] drm/arc: Move to drm/tiny Daniel Vetter
2020-09-04 14:39   ` [Intel-gfx] " Daniel Vetter
2020-09-09  7:54   ` Thomas Zimmermann
2020-09-09  7:54     ` [Intel-gfx] " Thomas Zimmermann
2020-09-04 15:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm_managed, leftovers Patchwork
2020-09-04 15:09 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-09-04 15:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-05  3:03 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-09-07  9:19 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm_managed, leftovers (rev2) Patchwork
2020-09-07  9:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-09-07  9:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-09  9:45 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm_managed, leftovers (rev3) Patchwork
2020-09-09 12:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm_managed, leftovers (rev4) Patchwork

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=20200904143941.110665-9-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 \
    /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.