From: Daniel Vetter <daniel@ffwll.ch>
To: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Deepak Sharma <deepak.sharma@amd.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 2/4] drm: BUG_ON if passing NULL parent to drm_dev_init
Date: Wed, 28 Mar 2018 09:17:32 +0200 [thread overview]
Message-ID: <20180328071732.GA14155@phenom.ffwll.local> (raw)
In-Reply-To: <20180328012451.31479-2-emil.l.velikov@gmail.com>
On Wed, Mar 28, 2018 at 02:24:49AM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov@collabora.com>
>
> Previous commit removed the only reason why we were allowing NULL as
> a parent device. With that resolved, we can enforce nobody else does
> that mistake.
>
> With that we can drop the ugly drm_dev_set_unique workaround.
>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Deepak Sharma <deepak.sharma@amd.com>
> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_drv.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index a1b9338736e3..88da984ff9eb 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -432,8 +432,6 @@ static void drm_fs_inode_free(struct inode *inode)
> * The initial ref-count of the object is 1. Use drm_dev_get() and
> * drm_dev_put() to take and drop further ref-counts.
> *
> - * Note that for purely virtual devices @parent can be NULL.
> - *
> * Drivers that do not want to allocate their own device struct
> * embedding &struct drm_device can call drm_dev_alloc() instead. For drivers
> * that do embed &struct drm_device it must be placed first in the overall
> @@ -458,6 +456,8 @@ int drm_dev_init(struct drm_device *dev,
> return -ENODEV;
> }
>
> + BUG_ON(parent == NULL);
> +
> kref_init(&dev->ref);
> dev->dev = parent;
> dev->driver = driver;
> @@ -506,9 +506,7 @@ int drm_dev_init(struct drm_device *dev,
> }
> }
>
> - /* Use the parent device name as DRM device unique identifier, but fall
> - * back to the driver name for virtual devices like vgem. */
> - ret = drm_dev_set_unique(dev, parent ? dev_name(parent) : driver->name);
> + ret = drm_dev_set_unique(dev, dev_name(parent));
> if (ret)
> goto err_setunique;
>
> --
> 2.16.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-03-28 7:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 1:24 [PATCH 1/4] drm/vgem: Fix vgem_init to get drm device avaliable Emil Velikov
2018-03-28 1:24 ` [PATCH 2/4] drm: BUG_ON if passing NULL parent to drm_dev_init Emil Velikov
2018-03-28 7:17 ` Daniel Vetter [this message]
2018-03-28 1:24 ` [PATCH 3/4] drm/virtio: remove drm_dev_set_unique workaround Emil Velikov
2018-03-28 7:18 ` Daniel Vetter
2018-03-28 10:27 ` Laszlo Ersek
2018-03-28 14:35 ` Emil Velikov
2018-03-29 11:17 ` Laszlo Ersek
2018-04-03 17:13 ` Emil Velikov
2018-04-04 17:29 ` Laszlo Ersek
2018-04-06 12:15 ` Laszlo Ersek
2018-04-06 12:56 ` Emil Velikov
2018-04-09 8:26 ` Daniel Vetter
2018-04-09 10:24 ` Emil Velikov
2018-04-09 11:25 ` Emil Velikov
2018-04-13 15:45 ` Daniel Vetter
2018-04-06 13:06 ` Gerd Hoffmann
2018-03-28 1:24 ` [PATCH 4/4] drm: drm_dev_set_unique private, again Emil Velikov
2018-03-28 7:18 ` Daniel Vetter
2018-03-28 7:16 ` [PATCH 1/4] drm/vgem: Fix vgem_init to get drm device avaliable Daniel Vetter
2018-03-28 14:45 ` Emil Velikov
2018-03-28 14:49 ` Chris Wilson
2018-03-28 15:11 ` Emil Velikov
2018-03-29 7:17 ` Daniel Vetter
2018-04-04 10:46 ` Emil Velikov
2018-04-04 12:07 ` 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=20180328071732.GA14155@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=deepak.sharma@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.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 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).