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 15:26:05 +0200 Message-ID: <20140829132601.GW17519@ulmo> References: <1409307166-12396-1-git-send-email-dh.herrmann@gmail.com> <1409307166-12396-10-git-send-email-dh.herrmann@gmail.com> <20140829115615.GI17519@ulmo> <20140829124310.GE15520@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2085099283==" Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTP id C9C446E3DB for ; Fri, 29 Aug 2014 06:26:07 -0700 (PDT) Received: by mail-wi0-f170.google.com with SMTP id cc10so800889wib.5 for ; Fri, 29 Aug 2014 06:26:07 -0700 (PDT) In-Reply-To: <20140829124310.GE15520@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============2085099283== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nSY6dmU9u4MMxp1o" Content-Disposition: inline --nSY6dmU9u4MMxp1o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. > > >=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_memor= y.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 > >=20 > > This check seems to be redundant. All architectures that support AGP > > provide this header. > >=20 > > > +# ifdef __powerpc__ > > > +# define PAGE_AGP __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) > >=20 > > Is this even necessary? It seems like PowerPC always defines > > HAVE_PAGE_AGP. >=20 > 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 --nSY6dmU9u4MMxp1o Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUAH9pAAoJEN0jrNd/PrOhzogQALYYMwncAXfnp/PPoTjx5sBP EqKPYxy66OUGZ3G2sxwLDylYX/Ag0SJjdZzoP2NtfGpDRv8R3TnBkaJPnDFuxflA AMA9nmi6X1X6EfsTwfOa47H6Ics6PDNt5GlIspKEe9sq/vvYZ5x3o2uWWTWNLyOg wSd9jly3iwp9UVO+oetQwEhAFOHozLLxjcUUFZ8v+A6TDcbsMQru2oqhPH7maPfC NI8FvU0do8X7sP9o51nDpHbTaD80o9c7agnqXgbGkG2pAVnPRBcwt+P3a7doH9aQ n3HDz6jThLXfPV4GCclq2SHc3B1C/XpehdLCANK6yRmDoyT6Q9v1cf8Dcqn+KdBq KtEU0BQ5Ri+fRcvF8uLuW0tcBi6DlxpoC3RBvdU73YREGzHuIwDAeIRgONweN8SI CYGP7k9aRP+da4zXbJRzm9D0NBlHqmY7TFzKwT3ngP+DPPMmRsAb/FhMSbTe+/Z5 lvIOXx6I48TGVEDfPb3dgjx6Owm3uYZTR9PtW7mXjnOMQ329rSlQ5xw6fqYGJ0oz FX79GkuUMjHUGfgCS/6wObD5wPxOuidbkr2s4aKPKMbzw2uHIr+Y0eQBFEVxE+/a n3aWSgkeCvllFJa1Zs//tDZud2WdFX4o7JzyTj1f2JRR5lkhXKkZ3dM8YXw81+pD oVJkLbTP/gpTG46pPl5m =i9tP -----END PGP SIGNATURE----- --nSY6dmU9u4MMxp1o-- --===============2085099283== 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 --===============2085099283==--