From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Luben Tuikov <luben.tuikov@amd.com>,
amd-gfx@lists.freedesktop.org
Subject: [PATCH 3/4] drm/amdgpu: Convert to using devm_drm_dev_alloc() (v2)
Date: Fri, 18 Sep 2020 15:25:04 +0200 [thread overview]
Message-ID: <20200918132505.2316382-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200918132505.2316382-1-daniel.vetter@ffwll.ch>
From: Luben Tuikov <luben.tuikov@amd.com>
Convert to using devm_drm_dev_alloc(),
as drm_dev_init() is going away.
v2: Remove drm_dev_put() since
a) devres doesn't do refcounting, see
Documentation/driver-api/driver-model/devres.rst,
Section 4, paragraph 1; and since
b) devres acts as garbage collector when
the DRM device's parent's devres "action" callback
is called to free the container device (amdgpu_device),
which embeds the DRM dev.
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6edde2b9e402..3ded6f43f982 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1142,25 +1142,20 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
if (ret)
return ret;
- adev = kzalloc(sizeof(*adev), GFP_KERNEL);
- if (!adev)
- return -ENOMEM;
+ adev = devm_drm_dev_alloc(&pdev->dev, &kms_driver, typeof(*adev), ddev);
+ if (IS_ERR(adev))
+ return PTR_ERR(adev);
adev->dev = &pdev->dev;
adev->pdev = pdev;
ddev = adev_to_drm(adev);
- ret = drm_dev_init(ddev, &kms_driver, &pdev->dev);
- if (ret)
- goto err_free;
-
- drmm_add_final_kfree(ddev, adev);
if (!supports_atomic)
ddev->driver_features &= ~DRIVER_ATOMIC;
ret = pci_enable_device(pdev);
if (ret)
- goto err_free;
+ return ret;
ddev->pdev = pdev;
pci_set_drvdata(pdev, ddev);
@@ -1188,8 +1183,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
err_pci:
pci_disable_device(pdev);
-err_free:
- drm_dev_put(ddev);
return ret;
}
@@ -1206,7 +1199,6 @@ amdgpu_pci_remove(struct pci_dev *pdev)
amdgpu_driver_unload_kms(dev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
- drm_dev_put(dev);
}
static void
--
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: Alex Deucher <alexander.deucher@amd.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Luben Tuikov <luben.tuikov@amd.com>,
amd-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 3/4] drm/amdgpu: Convert to using devm_drm_dev_alloc() (v2)
Date: Fri, 18 Sep 2020 15:25:04 +0200 [thread overview]
Message-ID: <20200918132505.2316382-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200918132505.2316382-1-daniel.vetter@ffwll.ch>
From: Luben Tuikov <luben.tuikov@amd.com>
Convert to using devm_drm_dev_alloc(),
as drm_dev_init() is going away.
v2: Remove drm_dev_put() since
a) devres doesn't do refcounting, see
Documentation/driver-api/driver-model/devres.rst,
Section 4, paragraph 1; and since
b) devres acts as garbage collector when
the DRM device's parent's devres "action" callback
is called to free the container device (amdgpu_device),
which embeds the DRM dev.
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6edde2b9e402..3ded6f43f982 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1142,25 +1142,20 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
if (ret)
return ret;
- adev = kzalloc(sizeof(*adev), GFP_KERNEL);
- if (!adev)
- return -ENOMEM;
+ adev = devm_drm_dev_alloc(&pdev->dev, &kms_driver, typeof(*adev), ddev);
+ if (IS_ERR(adev))
+ return PTR_ERR(adev);
adev->dev = &pdev->dev;
adev->pdev = pdev;
ddev = adev_to_drm(adev);
- ret = drm_dev_init(ddev, &kms_driver, &pdev->dev);
- if (ret)
- goto err_free;
-
- drmm_add_final_kfree(ddev, adev);
if (!supports_atomic)
ddev->driver_features &= ~DRIVER_ATOMIC;
ret = pci_enable_device(pdev);
if (ret)
- goto err_free;
+ return ret;
ddev->pdev = pdev;
pci_set_drvdata(pdev, ddev);
@@ -1188,8 +1183,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
err_pci:
pci_disable_device(pdev);
-err_free:
- drm_dev_put(ddev);
return ret;
}
@@ -1206,7 +1199,6 @@ amdgpu_pci_remove(struct pci_dev *pdev)
amdgpu_driver_unload_kms(dev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
- drm_dev_put(dev);
}
static void
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Luben Tuikov <luben.tuikov@amd.com>,
amd-gfx@lists.freedesktop.org
Subject: [PATCH 3/4] drm/amdgpu: Convert to using devm_drm_dev_alloc() (v2)
Date: Fri, 18 Sep 2020 15:25:04 +0200 [thread overview]
Message-ID: <20200918132505.2316382-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200918132505.2316382-1-daniel.vetter@ffwll.ch>
From: Luben Tuikov <luben.tuikov@amd.com>
Convert to using devm_drm_dev_alloc(),
as drm_dev_init() is going away.
v2: Remove drm_dev_put() since
a) devres doesn't do refcounting, see
Documentation/driver-api/driver-model/devres.rst,
Section 4, paragraph 1; and since
b) devres acts as garbage collector when
the DRM device's parent's devres "action" callback
is called to free the container device (amdgpu_device),
which embeds the DRM dev.
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6edde2b9e402..3ded6f43f982 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1142,25 +1142,20 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
if (ret)
return ret;
- adev = kzalloc(sizeof(*adev), GFP_KERNEL);
- if (!adev)
- return -ENOMEM;
+ adev = devm_drm_dev_alloc(&pdev->dev, &kms_driver, typeof(*adev), ddev);
+ if (IS_ERR(adev))
+ return PTR_ERR(adev);
adev->dev = &pdev->dev;
adev->pdev = pdev;
ddev = adev_to_drm(adev);
- ret = drm_dev_init(ddev, &kms_driver, &pdev->dev);
- if (ret)
- goto err_free;
-
- drmm_add_final_kfree(ddev, adev);
if (!supports_atomic)
ddev->driver_features &= ~DRIVER_ATOMIC;
ret = pci_enable_device(pdev);
if (ret)
- goto err_free;
+ return ret;
ddev->pdev = pdev;
pci_set_drvdata(pdev, ddev);
@@ -1188,8 +1183,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
err_pci:
pci_disable_device(pdev);
-err_free:
- drm_dev_put(ddev);
return ret;
}
@@ -1206,7 +1199,6 @@ amdgpu_pci_remove(struct pci_dev *pdev)
amdgpu_driver_unload_kms(dev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
- drm_dev_put(dev);
}
static void
--
2.28.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-09-18 13:25 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:25 [PATCH 0/4] managed drm_device, absolute final leftover bits Daniel Vetter
2020-09-18 13:25 ` Daniel Vetter
2020-09-18 13:25 ` [Intel-gfx] " Daniel Vetter
2020-09-18 13:25 ` [PATCH 1/4] drm/i915/selftest: Create mock_destroy_device Daniel Vetter
2020-09-18 13:25 ` Daniel Vetter
2020-09-18 13:25 ` [Intel-gfx] " Daniel Vetter
2020-09-18 13:25 ` [PATCH 2/4] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-09-18 13:25 ` Daniel Vetter
2020-09-18 13:25 ` [Intel-gfx] " Daniel Vetter
2020-09-18 17:50 ` Matthew Auld
2020-09-18 17:50 ` Matthew Auld
2020-09-18 17:50 ` [Intel-gfx] " Matthew Auld
2020-09-18 18:22 ` Daniel Vetter
2020-09-18 18:22 ` Daniel Vetter
2020-09-18 18:22 ` [Intel-gfx] " Daniel Vetter
2020-09-18 18:31 ` Matthew Auld
2020-09-18 18:31 ` Matthew Auld
2020-09-18 18:31 ` [Intel-gfx] " Matthew Auld
2020-09-18 18:46 ` Daniel Vetter
2020-09-18 18:46 ` Daniel Vetter
2020-09-18 18:46 ` [Intel-gfx] " Daniel Vetter
2020-09-18 20:00 ` [PATCH] " Daniel Vetter
2020-09-18 20:00 ` Daniel Vetter
2020-09-18 20:00 ` [Intel-gfx] " Daniel Vetter
2020-09-19 13:38 ` Daniel Vetter
2020-09-19 13:38 ` Daniel Vetter
2020-09-19 13:38 ` [Intel-gfx] " Daniel Vetter
2020-09-19 13:40 ` Daniel Vetter
2020-09-19 13:40 ` Daniel Vetter
2020-09-19 13:40 ` [Intel-gfx] " Daniel Vetter
2020-09-18 13:25 ` Daniel Vetter [this message]
2020-09-18 13:25 ` [PATCH 3/4] drm/amdgpu: Convert to using devm_drm_dev_alloc() (v2) Daniel Vetter
2020-09-18 13:25 ` [Intel-gfx] " Daniel Vetter
2020-09-18 13:25 ` [PATCH 4/4] drm/dev: Remove drm_dev_init Daniel Vetter
2020-09-18 13:25 ` Daniel Vetter
2020-09-18 13:25 ` [Intel-gfx] " Daniel Vetter
2020-09-18 14:26 ` Thomas Zimmermann
2020-09-18 14:26 ` Thomas Zimmermann
2020-09-18 14:26 ` [Intel-gfx] " Thomas Zimmermann
2020-09-18 14:31 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for managed drm_device, absolute final leftover bits Patchwork
2020-09-18 14:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-18 15:03 ` [PATCH 0/4] " Alex Deucher
2020-09-18 15:03 ` Alex Deucher
2020-09-18 15:03 ` [Intel-gfx] " Alex Deucher
2020-09-18 17:12 ` Rodrigo Vivi
2020-09-18 17:12 ` Rodrigo Vivi
2020-09-18 17:12 ` Rodrigo Vivi
2020-09-21 9:09 ` Daniel Vetter
2020-09-21 9:09 ` Daniel Vetter
2020-09-21 9:09 ` Daniel Vetter
2020-09-18 18:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2020-09-18 20:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for managed drm_device, absolute final leftover bits (rev2) Patchwork
2020-09-19 13:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for managed drm_device, absolute final leftover bits (rev4) Patchwork
2020-09-19 14:21 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-19 15:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20200918132505.2316382-4-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=luben.tuikov@amd.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 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.