From: Daniel Vetter <daniel@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 08/12] drm/legacy: move legacy dev reinit into an inline
Date: Tue, 23 Apr 2019 20:47:08 +0200 [thread overview]
Message-ID: <20190423184708.GD9857@phenom.ffwll.local> (raw)
In-Reply-To: <20190423020041.32702-9-airlied@gmail.com>
On Tue, Apr 23, 2019 at 12:00:37PM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> This moves the legacy dev reinit into a legacy inline,
> also removes some unneeded inlines now.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> drivers/gpu/drm/drm_file.c | 24 ------------------------
> drivers/gpu/drm/drm_legacy.h | 24 ++++++++++++++++++++++++
> 2 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
> index 9701469a6e93..263fbef73fe5 100644
> --- a/drivers/gpu/drm/drm_file.c
> +++ b/drivers/gpu/drm/drm_file.c
> @@ -425,30 +425,6 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
> return 0;
> }
>
> -static void drm_legacy_dev_reinit(struct drm_device *dev)
> -{
> - if (dev->irq_enabled)
> - drm_irq_uninstall(dev);
> -
> - mutex_lock(&dev->struct_mutex);
> -
> - drm_legacy_agp_clear(dev);
> -
> - drm_legacy_sg_cleanup(dev);
> - drm_legacy_vma_flush(dev);
> - drm_legacy_dma_takedown(dev);
> -
> - mutex_unlock(&dev->struct_mutex);
> -
> - dev->sigdata.lock = NULL;
> -
> - dev->context_flag = 0;
> - dev->last_context = 0;
> - dev->if_version = 0;
> -
> - DRM_DEBUG("lastclose completed\n");
> -}
> -
> void drm_lastclose(struct drm_device * dev)
> {
> DRM_DEBUG("\n");
> diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
> index 20c4befc476b..8ee2de06f999 100644
> --- a/drivers/gpu/drm/drm_legacy.h
> +++ b/drivers/gpu/drm/drm_legacy.h
> @@ -150,5 +150,29 @@ static inline void drm_legacy_destroy_members(struct drm_device *dev)
> mutex_destroy(&dev->ctxlist_mutex);
> }
>
> +static inline void drm_legacy_dev_reinit(struct drm_device *dev)
Like previous patch, stuff it into drm_legacy_misc.c or something like
that. With that:
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> +{
> + if (dev->irq_enabled)
> + drm_irq_uninstall(dev);
> +
> + mutex_lock(&dev->struct_mutex);
> +
> + drm_legacy_agp_clear(dev);
> +
> + drm_legacy_sg_cleanup(dev);
> + drm_legacy_vma_flush(dev);
> + drm_legacy_dma_takedown(dev);
> +
> + mutex_unlock(&dev->struct_mutex);
> +
> + dev->sigdata.lock = NULL;
> +
> + dev->context_flag = 0;
> + dev->last_context = 0;
> + dev->if_version = 0;
> +
> + DRM_DEBUG("lastclose completed\n");
> +}
> +
> void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master);
> #endif /* __DRM_LEGACY_H__ */
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
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:[~2019-04-23 18:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 2:00 drm: make legacy support code optional Dave Airlie
2019-04-23 2:00 ` [PATCH 01/12] drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v2) Dave Airlie
2019-04-23 2:00 ` [PATCH 02/12] drm/legacy: move drm_legacy_master_rmmaps to non-driver legacy header Dave Airlie
2019-04-23 2:00 ` [PATCH 03/12] drm/legacy: move map cleanups into drm_bufs.c Dave Airlie
2019-04-23 2:00 ` [PATCH 04/12] drm/radeon: drop unused ati pcigart include Dave Airlie
2019-04-23 13:07 ` Christian König
2019-04-23 2:00 ` [PATCH 05/12] drm/legacy: move lock cleanup for master into lock file Dave Airlie
2019-04-23 18:44 ` Daniel Vetter
2019-04-23 2:00 ` [PATCH 06/12] drm/legacy: move map_hash create/destroy into inlines Dave Airlie
2019-04-23 18:45 ` Daniel Vetter
2019-04-23 18:58 ` Daniel Vetter
2019-04-23 19:48 ` Sam Ravnborg
2019-04-23 2:00 ` [PATCH 07/12] drm/legacy: move init/destroy of struct members " Dave Airlie
2019-04-23 18:46 ` Daniel Vetter
2019-04-23 19:52 ` Sam Ravnborg
2019-04-23 2:00 ` [PATCH 08/12] drm/legacy: move legacy dev reinit into an inline Dave Airlie
2019-04-23 18:47 ` Daniel Vetter [this message]
2019-04-23 19:55 ` Sam Ravnborg
2019-04-23 2:00 ` [PATCH 09/12] drm/legacy: don't include any of ati_pcigart in legacy Dave Airlie
2019-04-23 18:50 ` Daniel Vetter
2019-04-23 19:58 ` Sam Ravnborg
2019-04-23 2:00 ` [PATCH 10/12] drm: allow removal of legacy codepaths (v4) Dave Airlie
2019-04-23 18:53 ` Daniel Vetter
2019-04-23 2:00 ` [PATCH 11/12] drm/legacy: place all drm legacy members under DRM_LEGACY Dave Airlie
2019-04-23 18:55 ` Daniel Vetter
2019-04-23 2:00 ` [PATCH 12/12] drm/legacy: remove some legacy lock struct members Dave Airlie
2019-04-23 18:57 ` 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=20190423184708.GD9857@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=dri-devel@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