* [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
@ 2015-07-22 8:29 Michel Dänzer
2015-07-22 8:29 ` [PATCH 2/2] drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h Michel Dänzer
2015-07-22 8:38 ` [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Christian König
0 siblings, 2 replies; 7+ messages in thread
From: Michel Dänzer @ 2015-07-22 8:29 UTC (permalink / raw)
To: dri-devel
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>
---
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)
--
2.1.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h
2015-07-22 8:29 [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Michel Dänzer
@ 2015-07-22 8:29 ` Michel Dänzer
2015-07-22 19:28 ` Alex Deucher
2015-07-22 8:38 ` [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Christian König
1 sibling, 1 reply; 7+ messages in thread
From: Michel Dänzer @ 2015-07-22 8:29 UTC (permalink / raw)
To: dri-devel
From: Michel Dänzer <michel.daenzer@amd.com>
This allows amdgpu_drm.h to be reused verbatim in libdrm.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
include/uapi/drm/amdgpu_drm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 780a581..ce4d617 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -32,7 +32,7 @@
#ifndef __AMDGPU_DRM_H__
#define __AMDGPU_DRM_H__
-#include <drm/drm.h>
+#include "drm.h"
#define DRM_AMDGPU_GEM_CREATE 0x00
#define DRM_AMDGPU_GEM_MMAP 0x01
--
2.1.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
2015-07-22 8:29 [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Michel Dänzer
2015-07-22 8:29 ` [PATCH 2/2] drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h Michel Dänzer
@ 2015-07-22 8:38 ` Christian König
2015-07-22 9:16 ` Daniel Vetter
1 sibling, 1 reply; 7+ messages in thread
From: Christian König @ 2015-07-22 8:38 UTC (permalink / raw)
To: Michel Dänzer, dri-devel
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)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
2015-07-22 8:38 ` [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Christian König
@ 2015-07-22 9:16 ` Daniel Vetter
2015-07-22 9:16 ` Michel Dänzer
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2015-07-22 9:16 UTC (permalink / raw)
To: Christian König; +Cc: Michel Dänzer, dri-devel
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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
2015-07-22 9:16 ` Daniel Vetter
@ 2015-07-22 9:16 ` Michel Dänzer
2015-07-22 9:33 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Michel Dänzer @ 2015-07-22 9:16 UTC (permalink / raw)
To: Daniel Vetter, Christian König; +Cc: dri-devel
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.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
2015-07-22 9:16 ` Michel Dänzer
@ 2015-07-22 9:33 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2015-07-22 9:33 UTC (permalink / raw)
To: Michel Dänzer; +Cc: 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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-07-22 19:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-22 8:29 [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Michel Dänzer
2015-07-22 8:29 ` [PATCH 2/2] drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h Michel Dänzer
2015-07-22 19:28 ` Alex Deucher
2015-07-22 8:38 ` [PATCH 1/2] drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h Christian König
2015-07-22 9:16 ` Daniel Vetter
2015-07-22 9:16 ` Michel Dänzer
2015-07-22 9:33 ` Daniel Vetter
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.