From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH 09/20] drm: merge drm_memory.h into drm_memory.c Date: Fri, 29 Aug 2014 13:56:23 +0200 Message-ID: <20140829115615.GI17519@ulmo> References: <1409307166-12396-1-git-send-email-dh.herrmann@gmail.com> <1409307166-12396-10-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2122087360==" Return-path: Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by gabe.freedesktop.org (Postfix) with ESMTP id F3A956E30A for ; Fri, 29 Aug 2014 04:56:27 -0700 (PDT) Received: by mail-we0-f169.google.com with SMTP id k48so2091788wev.0 for ; Fri, 29 Aug 2014 04:56:25 -0700 (PDT) In-Reply-To: <1409307166-12396-10-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Herrmann Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============2122087360== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="d6iqOn7HZPWKXx18" Content-Disposition: inline --d6iqOn7HZPWKXx18 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: David Herrmann > --- > 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 >=20 > 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" > =20 > #if __OS_HAS_AGP > + > +#ifdef HAVE_PAGE_AGP > +# include > +#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. > +# else > +# define PAGE_AGP PAGE_KERNEL > +# endif > +#endif Shouldn't this simply be moved into the asm/agp.h header for each of the architectures that has AGP? Thierry --d6iqOn7HZPWKXx18 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUAGpkAAoJEN0jrNd/PrOhphsP/jAUGudLs7Z0EDrZU63AS+YO NFvDLY28gAMH9qvaXkrYorn/fjTctoKfkeVJHJnFahecwiDLb5E9ObmpFEckovwd XUYm0LvDrAFmm81jzYo7S1GXvO3T3f2V/T7lu6ub+EoL3am/+op11W8uLL2wg07y u2fEQBW4085QBpg1Npt9Oc7z+Nh2StbZUMAUaJwqCk2rFE+N/MrE8h51/S/W8Cpr hThayh3NHrK9bfirYPWu2sK4nI5QgIwG+XK1E7ZaWRArxuF4ACXyCxcdhPQyIa0E KV3EPPHJwyAfdaX6VCNCmwcvyZ1zXHntyHj2SAz7pcQk9/gJuJvNB5qltRDEKOZz IJcH1wV64HmcihlvvOgw/goybCSrbNSa5Fj1ffvPbWgQUCghVUPr43BpZVTzo0K/ qQCrQlSAXNoRTT6i9nGmNrijYNicf+fVvfEo2Ose2+W3vsJI8mBGs8qIWH+1j/+j RM9dURK5wo8KOTPmNWdZ85Bep0yEGSEAMLCwmFrBrvVpjlQtq1StKmfMr0uYXe6f O/XEeOd+tvA/ENkrkruAoFuIZsSqoZwie4Rk3sY8ZNPCbDhWHB+OkVa5QHNJ3+cf 6iegYQO+xrWbf3EnP5sWCwFmfpbroEJ+3NBWacXElYYsqYlADCe+rM5E5WD6Gw5Z cT+BGdcKZ0OBVPLaU0s1 =bdMS -----END PGP SIGNATURE----- --d6iqOn7HZPWKXx18-- --===============2122087360== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --===============2122087360==--