dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 01/15] drm: Move dma functions into drm_legacy.h
Date: Thu, 11 Sep 2014 08:24:57 +0200	[thread overview]
Message-ID: <20140911062457.GY15520@phenom.ffwll.local> (raw)
In-Reply-To: <CANq1E4QRgh4QtQuQPGtf+qze93KmQe1uD6qFGpG27SruhQqWkw@mail.gmail.com>

On Wed, Sep 10, 2014 at 04:42:04PM +0200, David Herrmann wrote:
> Hi
> 
> On Wed, Sep 10, 2014 at 12:43 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Also drop the unneeded EXPORT_SYMBOL and sprinkle drm_legacy_ prefixes
> > where missing.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >  drivers/gpu/drm/drm_bufs.c   |  2 +-
> >  drivers/gpu/drm/drm_dma.c    | 10 ++++------
> >  drivers/gpu/drm/drm_fops.c   |  2 +-
> >  drivers/gpu/drm/drm_legacy.h |  8 ++++++++
> >  include/drm/drmP.h           |  7 -------
> >  5 files changed, 14 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
> > index 9e04d6a43fa4..70ba89f66199 100644
> > --- a/drivers/gpu/drm/drm_bufs.c
> > +++ b/drivers/gpu/drm/drm_bufs.c
> > @@ -1338,7 +1338,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data,
> >                                   task_pid_nr(current));
> >                         return -EINVAL;
> >                 }
> > -               drm_free_buffer(dev, buf);
> > +               drm_legacy_free_buffer(dev, buf);
> >         }
> >
> >         return 0;
> > diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
> > index 8a140a953754..9360c3915fe9 100644
> > --- a/drivers/gpu/drm/drm_dma.c
> > +++ b/drivers/gpu/drm/drm_dma.c
> > @@ -124,7 +124,7 @@ void drm_legacy_dma_takedown(struct drm_device *dev)
> >   *
> >   * Resets the fields of \p buf.
> >   */
> > -void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf)
> > +void drm_legacy_free_buffer(struct drm_device *dev, struct drm_buf * buf)
> >  {
> >         if (!buf)
> >                 return;
> > @@ -142,8 +142,8 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf)
> >   *
> >   * Frees each buffer associated with \p file_priv not already on the hardware.
> >   */
> > -void drm_core_reclaim_buffers(struct drm_device *dev,
> > -                             struct drm_file *file_priv)
> > +void drm_legacy_core_reclaim_buffers(struct drm_device *dev,
> > +                                    struct drm_file *file_priv)
> >  {
> >         struct drm_device_dma *dma = dev->dma;
> >         int i;
> > @@ -154,7 +154,7 @@ void drm_core_reclaim_buffers(struct drm_device *dev,
> >                 if (dma->buflist[i]->file_priv == file_priv) {
> >                         switch (dma->buflist[i]->list) {
> >                         case DRM_LIST_NONE:
> > -                               drm_free_buffer(dev, dma->buflist[i]);
> > +                               drm_legacy_free_buffer(dev, dma->buflist[i]);
> >                                 break;
> >                         case DRM_LIST_WAIT:
> >                                 dma->buflist[i]->list = DRM_LIST_RECLAIM;
> > @@ -166,5 +166,3 @@ void drm_core_reclaim_buffers(struct drm_device *dev,
> >                 }
> >         }
> >  }
> > -
> > -EXPORT_SYMBOL(drm_core_reclaim_buffers);
> > diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
> > index b419990042b0..6a8c9379bd42 100644
> > --- a/drivers/gpu/drm/drm_fops.c
> > +++ b/drivers/gpu/drm/drm_fops.c
> > @@ -404,7 +404,7 @@ int drm_release(struct inode *inode, struct file *filp)
> >                 drm_master_release(dev, filp);
> >
> >         if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
> > -               drm_core_reclaim_buffers(dev, file_priv);
> > +               drm_legacy_core_reclaim_buffers(dev, file_priv);
> >
> >         drm_events_release(file_priv);
> >
> > diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
> > index 3049af5a01b3..36755ac4f244 100644
> > --- a/drivers/gpu/drm/drm_legacy.h
> > +++ b/drivers/gpu/drm/drm_legacy.h
> > @@ -92,4 +92,12 @@ int drm_legacy_lock(struct drm_device *d, void *v, struct drm_file *f);
> >  int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f);
> >  int drm_legacy_lock_free(struct drm_lock_data *lock, unsigned int ctx);
> >
> > +/* DMA support */
> > +extern int drm_legacy_dma_setup(struct drm_device *dev);
> > +extern void drm_legacy_dma_takedown(struct drm_device *dev);
> > +extern void drm_legacy_free_buffer(struct drm_device *dev,
> > +                                  struct drm_buf * buf);
> > +extern void drm_legacy_core_reclaim_buffers(struct drm_device *dev,
> > +                                           struct drm_file *filp);
> > +
> 
> "_core_"  in the name doesn't really make much sense, but as long as
> it has "legacy", too, I guess nobody cares.

Will do.
> 
> You might wanna drop all the "extern " prefix for functions while
> doing the move. It has no affect at all (default for function
> declarations). Otherwise, looks good:

Yeah, missed it here and with the sg stuff in the next patch. Will fix.

> 
> Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
> 
> Thanks
> David
> 
> >  #endif /* __DRM_LEGACY_H__ */
> > diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> > index c5c9f0e44a7b..574e325d6b69 100644
> > --- a/include/drm/drmP.h
> > +++ b/include/drm/drmP.h
> > @@ -1158,13 +1158,6 @@ void drm_clflush_virt_range(void *addr, unsigned long length);
> >   * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
> >   */
> >
> > -                               /* DMA support (drm_dma.h) */
> > -extern int drm_legacy_dma_setup(struct drm_device *dev);
> > -extern void drm_legacy_dma_takedown(struct drm_device *dev);
> > -extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);
> > -extern void drm_core_reclaim_buffers(struct drm_device *dev,
> > -                                    struct drm_file *filp);
> > -
> >                                 /* IRQ support (drm_irq.h) */
> >  extern int drm_control(struct drm_device *dev, void *data,
> >                        struct drm_file *file_priv);
> > --
> > 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

  reply	other threads:[~2014-09-11  6:24 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 [this message]
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
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=20140911062457.GY15520@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