| Message ID | 1437553741-26553-1-git-send-email-michel@daenzer.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 22.07.2015 10:29, Michel Dänzer wrote: > From: Michel Dänzer <michel.daenzer@amd.com> > > This allows radeon_drm.h to be reused verbatim in libdrm. > > Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> For both patches Reviewed-by: Christian König <christian.koenig@amd.com> > --- > include/uapi/drm/radeon_drm.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > index 1ef7666..01aa2a8 100644 > --- a/include/uapi/drm/radeon_drm.h > +++ b/include/uapi/drm/radeon_drm.h > @@ -33,7 +33,7 @@ > #ifndef __RADEON_DRM_H__ > #define __RADEON_DRM_H__ > > -#include <drm/drm.h> > +#include "drm.h" > > /* WARNING: If you change any of these defines, make sure to change the > * defines in the X server file (radeon_sarea.h)
On 22.07.2015 18:16, Daniel Vetter wrote: > On Wed, Jul 22, 2015 at 10:38:18AM +0200, Christian König wrote: >> On 22.07.2015 10:29, Michel Dänzer wrote: >>> From: Michel Dänzer <michel.daenzer@amd.com> >>> >>> This allows radeon_drm.h to be reused verbatim in libdrm. >>> >>> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> >> >> For both patches Reviewed-by: Christian König <christian.koenig@amd.com> > > #ifdef __KERNEL__ > #include <drm/drm.h> > #else > #include <drm.h> > #endif > > then run > > $ make headers_install > > and copy results verbatim to libdrm. That's at least how it's supposed to > be done. What's the point of that? #include "drm.h" works in the kernel as well as in libdrm.
On Wed, Jul 22, 2015 at 10:38:18AM +0200, Christian König wrote: > On 22.07.2015 10:29, Michel Dänzer wrote: > >From: Michel Dänzer <michel.daenzer@amd.com> > > > >This allows radeon_drm.h to be reused verbatim in libdrm. > > > >Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> > > For both patches Reviewed-by: Christian König <christian.koenig@amd.com> #ifdef __KERNEL__ #include <drm/drm.h> #else #include <drm.h> #endif then run $ make headers_install and copy results verbatim to libdrm. That's at least how it's supposed to be done. Might be useful to do that for all headers and sync up latest headers with their copies in libdrm ... -Daniel > > >--- > > include/uapi/drm/radeon_drm.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > >index 1ef7666..01aa2a8 100644 > >--- a/include/uapi/drm/radeon_drm.h > >+++ b/include/uapi/drm/radeon_drm.h > >@@ -33,7 +33,7 @@ > > #ifndef __RADEON_DRM_H__ > > #define __RADEON_DRM_H__ > >-#include <drm/drm.h> > >+#include "drm.h" > > /* WARNING: If you change any of these defines, make sure to change the > > * defines in the X server file (radeon_sarea.h) > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Jul 22, 2015 at 06:16:41PM +0900, Michel Dänzer wrote: > On 22.07.2015 18:16, Daniel Vetter wrote: > > On Wed, Jul 22, 2015 at 10:38:18AM +0200, Christian König wrote: > >> On 22.07.2015 10:29, Michel Dänzer wrote: > >>> From: Michel Dänzer <michel.daenzer@amd.com> > >>> > >>> This allows radeon_drm.h to be reused verbatim in libdrm. > >>> > >>> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> > >> > >> For both patches Reviewed-by: Christian König <christian.koenig@amd.com> > > > > #ifdef __KERNEL__ > > #include <drm/drm.h> > > #else > > #include <drm.h> > > #endif > > > > then run > > > > $ make headers_install > > > > and copy results verbatim to libdrm. That's at least how it's supposed to > > be done. > > What's the point of that? > > #include "drm.h" > > works in the kernel as well as in libdrm. None for this case, was just an example how to handle the userspace headers since you've said verbatim copy. It shouldn't ever be a verbatim copy but always go through make headers_install. And it might make sense to clean this up for all drivers since there's a bunch of random differences in these. Anyway was just an idea. -Daniel
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 1ef7666..01aa2a8 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -33,7 +33,7 @@ #ifndef __RADEON_DRM_H__ #define __RADEON_DRM_H__ -#include <drm/drm.h> +#include "drm.h" /* WARNING: If you change any of these defines, make sure to change the * defines in the X server file (radeon_sarea.h)