| From da54a525b9154efc294a14fac73efa97966c0d03 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org> |
| Date: Mon, 25 Feb 2019 15:42:26 +0100 |
| Subject: drm/drv: Hold ref on parent device during drm_device lifetime |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| [ Upstream commit 56be6503aab2bc3a30beae408071b9be5e1bae51 ] |
| |
| This makes it safe to access drm_device->dev after the parent device has |
| been removed/unplugged. |
| |
| Signed-off-by: Noralf TrΓΈnnes <noralf@tronnes.org> |
| Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190225144232.20761-2-noralf@tronnes.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/drm_drv.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c |
| index 05bbc2b622fc1..04aa6ccdfb242 100644 |
| --- a/drivers/gpu/drm/drm_drv.c |
| +++ b/drivers/gpu/drm/drm_drv.c |
| @@ -497,7 +497,7 @@ int drm_dev_init(struct drm_device *dev, |
| BUG_ON(!parent); |
| |
| kref_init(&dev->ref); |
| - dev->dev = parent; |
| + dev->dev = get_device(parent); |
| dev->driver = driver; |
| |
| /* no per-device feature limits by default */ |
| @@ -567,6 +567,7 @@ int drm_dev_init(struct drm_device *dev, |
| drm_minor_free(dev, DRM_MINOR_RENDER); |
| drm_fs_inode_free(dev->anon_inode); |
| err_free: |
| + put_device(dev->dev); |
| mutex_destroy(&dev->master_mutex); |
| mutex_destroy(&dev->ctxlist_mutex); |
| mutex_destroy(&dev->clientlist_mutex); |
| @@ -602,6 +603,8 @@ void drm_dev_fini(struct drm_device *dev) |
| drm_minor_free(dev, DRM_MINOR_PRIMARY); |
| drm_minor_free(dev, DRM_MINOR_RENDER); |
| |
| + put_device(dev->dev); |
| + |
| mutex_destroy(&dev->master_mutex); |
| mutex_destroy(&dev->ctxlist_mutex); |
| mutex_destroy(&dev->clientlist_mutex); |
| -- |
| 2.20.1 |
| |