From: Daniel Vetter <daniel@ffwll.ch> To: Gerd Hoffmann <kraxel@redhat.com> Cc: dri-devel@lists.freedesktop.org, Gurchetan Singh <gurchetansingh@chromium.org>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" <virtualization@lists.linux-foundation.org>, open list <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] drm/bochs: add drm_driver.release callback. Date: Fri, 7 Feb 2020 14:42:25 +0100 [thread overview] Message-ID: <20200207134225.GA43062@phenom.ffwll.local> (raw) In-Reply-To: <20200207121312.25296-1-kraxel@redhat.com> On Fri, Feb 07, 2020 at 01:13:12PM +0100, Gerd Hoffmann wrote: > From: Gurchetan Singh <gurchetansingh@chromium.org> > > Move bochs_unload call from bochs_remove() to the new bochs_release() > callback. Also call drm_dev_unregister() first in bochs_remove(). > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c > index 10460878414e..87ee1eb21a4d 100644 > --- a/drivers/gpu/drm/bochs/bochs_drv.c > +++ b/drivers/gpu/drm/bochs/bochs_drv.c > @@ -60,6 +60,11 @@ static int bochs_load(struct drm_device *dev) > > DEFINE_DRM_GEM_FOPS(bochs_fops); > > +static void bochs_release(struct drm_device *dev) > +{ > + bochs_unload(dev); Hm I think this needs to be split, and bochs_hw_fini needs to stay in bochs_pci_remove. Otherwise we again release the iommu mappings too late (there was just a discussion about that on the fbdev side of things getting this wrong). Good to fix the lifetime fun here, but let's not move too far :-) Ideally we'd move the iomapping to devm_, that would remove it at the right time I think. Slight annoyance might be that we then need to shoot down the varios mmaps, which I frankly don't know how to do. But keeping them pointing at wrong stuff also isn't that great :-/ Cheers, Daniel > +} > + > static struct drm_driver bochs_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > .fops = &bochs_fops, > @@ -69,6 +74,7 @@ static struct drm_driver bochs_driver = { > .major = 1, > .minor = 0, > DRM_GEM_VRAM_DRIVER, > + .release = bochs_release, > }; > > /* ---------------------------------------------------------------------- */ > @@ -148,9 +154,8 @@ static void bochs_pci_remove(struct pci_dev *pdev) > { > struct drm_device *dev = pci_get_drvdata(pdev); > > - drm_atomic_helper_shutdown(dev); > drm_dev_unregister(dev); > - bochs_unload(dev); > + drm_atomic_helper_shutdown(dev); > drm_dev_put(dev); > } > > -- > 2.18.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: Gerd Hoffmann <kraxel@redhat.com> Cc: David Airlie <airlied@linux.ie>, open list <linux-kernel@vger.kernel.org>, dri-devel@lists.freedesktop.org, "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" <virtualization@lists.linux-foundation.org>, Gurchetan Singh <gurchetansingh@chromium.org> Subject: Re: [PATCH] drm/bochs: add drm_driver.release callback. Date: Fri, 7 Feb 2020 14:42:25 +0100 [thread overview] Message-ID: <20200207134225.GA43062@phenom.ffwll.local> (raw) In-Reply-To: <20200207121312.25296-1-kraxel@redhat.com> On Fri, Feb 07, 2020 at 01:13:12PM +0100, Gerd Hoffmann wrote: > From: Gurchetan Singh <gurchetansingh@chromium.org> > > Move bochs_unload call from bochs_remove() to the new bochs_release() > callback. Also call drm_dev_unregister() first in bochs_remove(). > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c > index 10460878414e..87ee1eb21a4d 100644 > --- a/drivers/gpu/drm/bochs/bochs_drv.c > +++ b/drivers/gpu/drm/bochs/bochs_drv.c > @@ -60,6 +60,11 @@ static int bochs_load(struct drm_device *dev) > > DEFINE_DRM_GEM_FOPS(bochs_fops); > > +static void bochs_release(struct drm_device *dev) > +{ > + bochs_unload(dev); Hm I think this needs to be split, and bochs_hw_fini needs to stay in bochs_pci_remove. Otherwise we again release the iommu mappings too late (there was just a discussion about that on the fbdev side of things getting this wrong). Good to fix the lifetime fun here, but let's not move too far :-) Ideally we'd move the iomapping to devm_, that would remove it at the right time I think. Slight annoyance might be that we then need to shoot down the varios mmaps, which I frankly don't know how to do. But keeping them pointing at wrong stuff also isn't that great :-/ Cheers, Daniel > +} > + > static struct drm_driver bochs_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > .fops = &bochs_fops, > @@ -69,6 +74,7 @@ static struct drm_driver bochs_driver = { > .major = 1, > .minor = 0, > DRM_GEM_VRAM_DRIVER, > + .release = bochs_release, > }; > > /* ---------------------------------------------------------------------- */ > @@ -148,9 +154,8 @@ static void bochs_pci_remove(struct pci_dev *pdev) > { > struct drm_device *dev = pci_get_drvdata(pdev); > > - drm_atomic_helper_shutdown(dev); > drm_dev_unregister(dev); > - bochs_unload(dev); > + drm_atomic_helper_shutdown(dev); > drm_dev_put(dev); > } > > -- > 2.18.1 > -- 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:[~2020-02-07 13:42 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-07 12:13 [PATCH] drm/bochs: add drm_driver.release callback Gerd Hoffmann 2020-02-07 12:13 ` Gerd Hoffmann 2020-02-07 12:13 ` Gerd Hoffmann 2020-02-07 13:15 ` Thomas Zimmermann 2020-02-07 13:15 ` Thomas Zimmermann 2020-02-07 13:15 ` Thomas Zimmermann 2020-02-07 13:42 ` Daniel Vetter [this message] 2020-02-07 13:42 ` Daniel Vetter 2020-02-07 13:42 ` 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=20200207134225.GA43062@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=gurchetansingh@chromium.org \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.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: linkBe 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.