From: Daniel Vetter <daniel@ffwll.ch>
To: David Herrmann <dh.herrmann@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 02/15] drm: Move sg functions into drm_legacy.h
Date: Thu, 11 Sep 2014 08:29:13 +0200 [thread overview]
Message-ID: <20140911062913.GZ15520@phenom.ffwll.local> (raw)
In-Reply-To: <CANq1E4Q-L_r1pJVfxfw=oXc3UMHpfEw0A_=nySQKh0aUkqcPgA@mail.gmail.com>
On Wed, Sep 10, 2014 at 04:43:31PM +0200, David Herrmann wrote:
> Hi
>
> On Wed, Sep 10, 2014 at 12:43 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Also sprinkle the drm_legacy_ prefix where missing.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > drivers/gpu/drm/drm_ioctl.c | 4 ++--
> > drivers/gpu/drm/drm_legacy.h | 7 +++++++
> > drivers/gpu/drm/drm_scatter.c | 8 ++++----
> > include/drm/drmP.h | 7 -------
> > 4 files changed, 13 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> > index bfb3b85dbe2d..7d6df78bb25d 100644
> > --- a/drivers/gpu/drm/drm_ioctl.c
> > +++ b/drivers/gpu/drm/drm_ioctl.c
> > @@ -108,8 +108,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
> > DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> > #endif
> >
> > - DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> > - DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> > + DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_legacy_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> > + DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_legacy_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> >
> > DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),
> >
> > diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
> > index 36755ac4f244..d8bc895bc376 100644
> > --- a/drivers/gpu/drm/drm_legacy.h
> > +++ b/drivers/gpu/drm/drm_legacy.h
> > @@ -100,4 +100,11 @@ extern void drm_legacy_free_buffer(struct drm_device *dev,
> > extern void drm_legacy_core_reclaim_buffers(struct drm_device *dev,
> > struct drm_file *filp);
> >
> > +/* Scatter Gather Support */
> > +extern void drm_legacy_sg_cleanup(struct drm_device *dev);
> > +extern int drm_legacy_sg_alloc(struct drm_device *dev, void *data,
> > + struct drm_file *file_priv);
> > +extern int drm_legacy_sg_free(struct drm_device *dev, void *data,
> > + struct drm_file *file_priv);
> > +
> > #endif /* __DRM_LEGACY_H__ */
> > diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c
> > index 1c78406f6e71..a02605c96224 100644
> > --- a/drivers/gpu/drm/drm_scatter.c
> > +++ b/drivers/gpu/drm/drm_scatter.c
> > @@ -78,8 +78,8 @@ void drm_legacy_sg_cleanup(struct drm_device *dev)
>
> Can you include "drm_legacy.h" from drm_scatter.c, please? Otherwise,
> we will not catch wrong function declarations in the header file.
Some later patches adds that ;-) But I've noticed that my include rules
are a bit inconsistent, the new ones are:
- All drm.ko source files that need legacy stuff include "drm_legacy.h".
That file in turn then includes <drm/drm_legacy.h>
- Drivers only ever include <drm/drm_legacy.c>
Thanks, Daniel
>
> Thanks
> David
>
> > # define ScatterHandle(x) (unsigned int)(x)
> > #endif
> >
> > -int drm_sg_alloc(struct drm_device *dev, void *data,
> > - struct drm_file *file_priv)
> > +int drm_legacy_sg_alloc(struct drm_device *dev, void *data,
> > + struct drm_file *file_priv)
> > {
> > struct drm_scatter_gather *request = data;
> > struct drm_sg_mem *entry;
> > @@ -194,8 +194,8 @@ int drm_sg_alloc(struct drm_device *dev, void *data,
> > return -ENOMEM;
> > }
> >
> > -int drm_sg_free(struct drm_device *dev, void *data,
> > - struct drm_file *file_priv)
> > +int drm_legacy_sg_free(struct drm_device *dev, void *data,
> > + struct drm_file *file_priv)
> > {
> > struct drm_scatter_gather *request = data;
> > struct drm_sg_mem *entry;
> > diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> > index 574e325d6b69..1d1468bcd69f 100644
> > --- a/include/drm/drmP.h
> > +++ b/include/drm/drmP.h
> > @@ -1316,13 +1316,6 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr
> >
> > extern int drm_vma_info(struct seq_file *m, void *data);
> >
> > - /* Scatter Gather Support (drm_scatter.h) */
> > -extern void drm_legacy_sg_cleanup(struct drm_device *dev);
> > -extern int drm_sg_alloc(struct drm_device *dev, void *data,
> > - struct drm_file *file_priv);
> > -extern int drm_sg_free(struct drm_device *dev, void *data,
> > - struct drm_file *file_priv);
> > -
> > /* ATI PCIGART support (ati_pcigart.h) */
> > extern int drm_ati_pcigart_init(struct drm_device *dev,
> > struct drm_ati_pcigart_info * gart_info);
> > --
> > 1.9.3
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2014-09-11 6:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 10:43 [PATCH 00/15] put drmP.h on diet Daniel Vetter
2014-09-10 10:43 ` [PATCH 01/15] drm: Move dma functions into drm_legacy.h Daniel Vetter
2014-09-10 14:42 ` David Herrmann
2014-09-11 6:24 ` Daniel Vetter
2014-09-11 5:41 ` [PATCH] " Daniel Vetter
2014-09-10 10:43 ` [PATCH 02/15] drm: Move sg " Daniel Vetter
2014-09-10 14:43 ` David Herrmann
2014-09-11 6:29 ` Daniel Vetter [this message]
2014-09-11 5:42 ` [PATCH] " Daniel Vetter
2014-09-10 10:43 ` [PATCH 03/15] drm: Move drm_legacy_vma_flush " Daniel Vetter
2014-09-10 10:43 ` [PATCH 04/15] drm: Create drm legacy driver header Daniel Vetter
2014-09-10 10:43 ` [PATCH 05/15] drm: Move ati pci gart into <drm/drm_legacy.h> Daniel Vetter
2014-09-10 10:43 ` [PATCH 06/15] drm: Move __drm_pci_free to drm_legacy.c Daniel Vetter
2014-09-10 10:43 ` [PATCH 07/15] drm: Drop drm_sysfs_class from drmP.h Daniel Vetter
2014-09-10 10:43 ` [PATCH 08/15] drm: Move piles of functions from drmP.h to drm_internal.h Daniel Vetter
2014-09-10 10:43 ` [PATCH 09/15] drm: unexport drm_global_mutex Daniel Vetter
2014-09-10 10:43 ` [PATCH 10/15] drm: Purge ioctl forward declarations from drmP.h Daniel Vetter
2014-09-10 10:43 ` [PATCH 11/15] drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h> Daniel Vetter
2014-09-10 10:43 ` [PATCH 12/15] drm: Move legacy buffer structures " Daniel Vetter
2014-09-11 5:43 ` [PATCH] " Daniel Vetter
2014-09-10 10:43 ` [PATCH 13/15] drm: Move LOCK_TEST_WITH_RETURN " Daniel Vetter
2014-09-10 10:43 ` [PATCH 14/15] drm: Move drm_class to drm_internal.h Daniel Vetter
2014-09-10 10:44 ` [PATCH 15/15] drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c 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=20140911062913.GZ15520@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dh.herrmann@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