All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 09/20] drm: merge drm_memory.h into drm_memory.c
Date: Fri, 29 Aug 2014 15:26:05 +0200	[thread overview]
Message-ID: <20140829132601.GW17519@ulmo> (raw)
In-Reply-To: <20140829124310.GE15520@phenom.ffwll.local>


[-- Attachment #1.1: Type: text/plain, Size: 2055 bytes --]

On Fri, Aug 29, 2014 at 02:43:10PM +0200, Daniel Vetter wrote:
> On Fri, Aug 29, 2014 at 01:56:23PM +0200, Thierry Reding wrote:
> > On Fri, Aug 29, 2014 at 12:12:35PM +0200, David Herrmann wrote:
> > > The drm_memory.h header is only used to define PAGE_AGP, which is only
> > > used in drm_memory.c. Fold the header into drm_memory.c and drop it.
> > > 
> > > Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
> > > ---
> > >  drivers/gpu/drm/drm_memory.c | 11 +++++++++
> > >  include/drm/drmP.h           |  6 ++---
> > >  include/drm/drm_memory.h     | 59 --------------------------------------------
> > >  3 files changed, 13 insertions(+), 63 deletions(-)
> > >  delete mode 100644 include/drm/drm_memory.h
> > > 
> > > diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
> > > index 7888dad..62fda6a 100644
> > > --- a/drivers/gpu/drm/drm_memory.c
> > > +++ b/drivers/gpu/drm/drm_memory.c
> > > @@ -39,6 +39,17 @@
> > >  #include "drm_legacy.h"
> > >  
> > >  #if __OS_HAS_AGP
> > > +
> > > +#ifdef HAVE_PAGE_AGP
> > > +# include <asm/agp.h>
> > > +#else
> > 
> > This check seems to be redundant. All architectures that support AGP
> > provide this header.
> > 
> > > +# ifdef __powerpc__
> > > +#  define PAGE_AGP	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
> > 
> > Is this even necessary? It seems like PowerPC always defines
> > HAVE_PAGE_AGP.
> 
> Iirc I've tried to untangle this before and I'm not 100% this is actually
> the case on all ppc platforms. It looked like there's some crazy include
> header depency stuff going on.

Interestingly, I don't even see _PAGE_KERNEL defined on PowerPC...

> But given how popular drm on ppc and that the few platforms where people
> actually use gpus are the saner ones (hopefully) I think we can just move
> ahead with this change and fixup any compile breakage once it's reported.
> If there is any.

I'm not objecting to this change since it's merely reorganizing code.
This is just more possible future cleanup.

Thierry

[-- Attachment #1.2: Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2014-08-29 13:26 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-29 10:12 [PATCH 00/20] DRM: Core Cleanups David Herrmann
2014-08-29 10:12 ` [PATCH 01/20] drm/radeon: move drm_buffer to drm/radeon/ David Herrmann
2014-08-29 11:20   ` Thierry Reding
2014-09-08  4:08   ` Alex Deucher
2014-08-29 10:12 ` [PATCH 02/20] drm: mark drm_buf and drm_map as legacy David Herrmann
2014-08-29 11:32   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 03/20] drm: move "struct drm_vma_entry" to drm_vm.c David Herrmann
2014-08-29 11:34   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 04/20] drm: move "struct drm_magic_entry" to drm_auth.c David Herrmann
2014-08-29 11:39   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 05/20] drm: drop unused "struct drm_waitlist" David Herrmann
2014-08-29 11:40   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 06/20] drm: move AGP definitions harder David Herrmann
2014-08-29 11:43   ` Thierry Reding
2014-08-29 12:39     ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 07/20] drm: replace weird conditional includes David Herrmann
2014-08-29 11:45   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 08/20] drm: drop __KERNEL__ protection in drmP.h David Herrmann
2014-08-29 11:46   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 09/20] drm: merge drm_memory.h into drm_memory.c David Herrmann
2014-08-29 11:56   ` Thierry Reding
2014-08-29 12:43     ` Daniel Vetter
2014-08-29 13:26       ` Thierry Reding [this message]
2014-08-29 10:12 ` [PATCH 10/20] drm: move __OS_HAS_AGP into drm_agpsupport.h David Herrmann
2014-08-29 12:03   ` Thierry Reding
2014-08-29 12:45     ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 11/20] drm: order includes alphabetically in drmP.h David Herrmann
2014-08-29 12:05   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 12/20] drm: drop DRM_DEBUG_CODE David Herrmann
2014-08-29 12:10   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 13/20] drm: inline "struct drm_sigdata" David Herrmann
2014-08-29 12:21   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 14/20] drm: move remaining includes in drmP.h to the top David Herrmann
2014-08-29 12:26   ` Thierry Reding
2014-08-29 10:12 ` [PATCH 15/20] drm: simplify drm_*_set_unique() David Herrmann
2014-08-29 12:39   ` Thierry Reding
2014-08-29 12:58   ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 16/20] drm: drop unused drm_master->unique_size David Herrmann
2014-08-29 12:41   ` Thierry Reding
2014-08-29 12:58   ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 17/20] drm: add driver->set_busid() callback David Herrmann
2014-08-29 12:54   ` Thierry Reding
2014-08-29 13:01   ` Daniel Vetter
2014-08-29 13:30     ` Thierry Reding
2014-08-29 10:12 ` [PATCH 18/20] drm: Goody bye, drm_bus! David Herrmann
2014-08-29 12:55   ` Thierry Reding
2014-08-29 13:02   ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 19/20] drm: merge drm_usb into udl David Herrmann
2014-08-29 13:00   ` Thierry Reding
2014-08-29 13:06   ` Daniel Vetter
2014-08-29 10:12 ` [PATCH 20/20] drm: move drm-lock API to drm_legacy.h David Herrmann
2014-08-29 13:02   ` Thierry Reding
2014-08-29 13:08 ` [PATCH 00/20] DRM: Core Cleanups 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=20140829132601.GW17519@ulmo \
    --to=thierry.reding@gmail.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel@ffwll.ch \
    --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 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.