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] drm/i915/selftests: align more to real device lifetimes
Date: Sat, 4 Apr 2020 00:31:39 +0200 [thread overview]
Message-ID: <20200403223139.2729900-1-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200403135828.2542770-44-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
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
.../gpu/drm/i915/selftests/mock_gem_device.c | 33 +++++++++----------
1 file changed, 16 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 41afc357f4d0..1ab97fa55929 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -123,12 +123,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;
@@ -139,8 +133,23 @@ struct drm_i915_private *mock_gem_device(void)
/* hack to disable iommu for the fake device; force identity mapping */
pdev->dev.archdata.iommu = (void *)-1;
#endif
+ err = device_add(&pdev->dev);
+ if (err) {
+ kfree(pdev);
+ 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);
+ put_device(&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);
@@ -148,16 +157,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);
intel_runtime_pm_init_early(&i915->runtime_pm);
@@ -221,5 +220,5 @@ struct drm_i915_private *mock_gem_device(void)
void mock_destroy_device(struct drm_i915_private *i915)
{
- drm_dev_put(&i915->drm);
+ device_del(i915->drm.dev);
}
--
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-03 22:31 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 13:57 [PATCH 00/44] devm_drm_dev_alloc, no more drmm_add_final_kfree Daniel Vetter
2020-04-03 13:57 ` [PATCH 01/44] drivers/base: Always release devres on device_del Daniel Vetter
2020-04-03 14:17 ` Greg Kroah-Hartman
2020-04-03 14:47 ` Daniel Vetter
2020-04-03 14:51 ` Daniel Vetter
2020-04-03 15:01 ` Greg Kroah-Hartman
2020-04-03 15:06 ` Greg Kroah-Hartman
2020-04-03 15:15 ` Daniel Vetter
2020-04-03 15:33 ` Daniel Vetter
2020-04-06 12:32 ` Daniel Vetter
2020-04-06 13:38 ` Greg Kroah-Hartman
2020-04-06 13:55 ` Daniel Vetter
2020-04-28 13:15 ` Daniel Vetter
2020-05-15 12:55 ` Greg Kroah-Hartman
2020-05-15 14:05 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 02/44] drm: Add devm_drm_dev_alloc macro Daniel Vetter
2020-04-05 10:20 ` Noralf Trønnes
2020-04-06 12:00 ` Laurent Pinchart
2020-04-06 12:18 ` Daniel Vetter
2020-04-08 6:57 ` Sam Ravnborg
2020-04-08 12:11 ` Daniel Vetter
2020-04-08 18:55 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 03/44] drm/device: Deprecate dev_private harder Daniel Vetter
2020-04-08 7:02 ` Sam Ravnborg
2020-04-14 16:43 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 04/44] drm/vgem: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:57 ` [PATCH 05/44] drm/vkms: " Daniel Vetter
2020-04-03 13:57 ` [PATCH 06/44] drm/vboxvideo: drop DRM_MTRR_WC #define Daniel Vetter
2020-04-08 7:03 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 07/44] drm/vboxvideo: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:57 ` [PATCH 08/44] drm/vboxvideo: Stop using drm_device->dev_private Daniel Vetter
2020-04-06 11:56 ` Thomas Zimmermann
2020-04-07 7:24 ` Daniel Vetter
2020-04-08 6:33 ` Thomas Zimmermann
2020-04-08 7:19 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 09/44] drm/vboxvidoe: use managed pci functions Daniel Vetter
2020-04-08 7:21 ` Sam Ravnborg
2020-04-14 16:30 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 10/44] drm/vboxvideo: Use devm_gen_pool_create Daniel Vetter
2020-04-08 7:24 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 11/44] drm/v3d: Don't set drm_device->dev_private Daniel Vetter
2020-04-03 17:39 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 12/44] drm/v3d: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 17:38 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 13/44] drm/v3d: Delete v3d_dev->dev Daniel Vetter
2020-04-03 17:35 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 14/44] drm/v3d: Delete v3d_dev->pdev Daniel Vetter
2020-04-03 17:35 ` Eric Anholt
2020-04-08 7:27 ` Sam Ravnborg
2020-04-08 12:13 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 15/44] drm/udl: Use demv_drm_dev_alloc Daniel Vetter
2020-04-05 10:18 ` Noralf Trønnes
2020-04-05 13:47 ` Daniel Vetter
2020-04-05 14:46 ` Noralf Trønnes
2020-04-06 12:05 ` Thomas Zimmermann
2020-04-03 13:58 ` [PATCH 16/44] drm/udl: don't set drm_device->dev_private Daniel Vetter
2020-04-06 11:52 ` Thomas Zimmermann
2020-04-08 7:29 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 17/44] drm/st7735r: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 17:00 ` David Lechner
2020-04-03 13:58 ` [PATCH 18/44] drm/st7586: " Daniel Vetter
2020-04-03 17:01 ` David Lechner
2020-04-03 13:58 ` [PATCH 19/44] drm/repaper: " Daniel Vetter
2020-04-05 10:00 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 20/44] drm/mi0283qt: " Daniel Vetter
2020-04-05 10:01 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 21/44] drm/ili9486: " Daniel Vetter
2020-04-05 10:02 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 22/44] drm/ili9341: " Daniel Vetter
2020-04-03 17:02 ` David Lechner
2020-04-03 13:58 ` [PATCH 23/44] drm/ili9225: " Daniel Vetter
2020-04-03 17:02 ` David Lechner
2020-04-03 13:58 ` [PATCH 24/44] drm/hx8357d: " Daniel Vetter
2020-04-03 17:38 ` Eric Anholt
2020-04-03 13:58 ` [PATCH 25/44] drm/gm12u320: " Daniel Vetter
2020-04-03 13:58 ` [PATCH 26/44] drm/gm12u320: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 13:58 ` [PATCH 27/44] drm/tidss: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:52 ` Sam Ravnborg
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 28/44] drm/tidss: Don't use drm_device->dev_private Daniel Vetter
2020-04-08 7:52 ` Sam Ravnborg
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 29/44] drm/tidss: Delete tidss->saved_state Daniel Vetter
2020-04-08 7:53 ` Sam Ravnborg
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 30/44] drm/qxl: Use devm_drm_dev_alloc Daniel Vetter
2020-04-06 6:55 ` Gerd Hoffmann
2020-04-06 12:11 ` Thomas Zimmermann
2020-04-07 7:19 ` Daniel Vetter
2020-04-03 13:58 ` [PATCH 31/44] drm/qxl: Don't use drm_device->dev_private Daniel Vetter
2020-04-06 6:55 ` Gerd Hoffmann
2020-04-03 13:58 ` [PATCH 32/44] drm/mcde: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:57 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 33/44] drm/mcde: Don't use drm_device->dev_private Daniel Vetter
2020-04-08 7:58 ` Sam Ravnborg
2020-04-12 0:44 ` Linus Walleij
2020-04-03 13:58 ` [PATCH 34/44] drm/ingenic: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:59 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 35/44] drm/ingenic: Don't set drm_device->dev_private Daniel Vetter
2020-04-08 8:00 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 36/44] drm/komeda: use devm_drm_dev_alloc Daniel Vetter
2020-04-08 8:40 ` james qian wang (Arm Technology China)
2020-04-08 9:03 ` Daniel Vetter
2020-04-03 13:58 ` [PATCH 37/44] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:58 ` [PATCH 38/44] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 13:58 ` [PATCH 39/44] drm/cirrus: Use devm_drm_dev_alloc Daniel Vetter
2020-04-05 10:04 ` Noralf Trønnes
2020-04-08 8:01 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 40/44] drm/cirrus: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 17:40 ` Eric Anholt
2020-04-06 11:58 ` Thomas Zimmermann
2020-04-08 8:04 ` Sam Ravnborg
2020-04-08 8:01 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 41/44] drm/i915: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:58 ` [PATCH 42/44] drm/i915/selftest: Create mock_destroy_device Daniel Vetter
2020-04-03 22:31 ` [PATCH] " Daniel Vetter
2020-04-03 13:58 ` [PATCH 43/44] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-04-03 22:31 ` Daniel Vetter [this message]
2020-04-03 13:58 ` [PATCH 44/44] drm/managed: Cleanup of unused functions and polishing docs Daniel Vetter
2020-04-05 10:29 ` Noralf Trønnes
2020-04-08 8:08 ` [PATCH 00/44] devm_drm_dev_alloc, no more drmm_add_final_kfree Sam Ravnborg
2020-04-08 12:15 ` Daniel Vetter
2020-09-18 13:25 [PATCH 2/4] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-09-18 20:00 ` [PATCH] " Daniel Vetter
2020-09-19 13:38 ` Daniel Vetter
2020-09-19 13:40 ` 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=20200403223139.2729900-1-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 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).