[PATCH] libdrm/amdgpu: Fixed drm.h include.

[PATCH] libdrm/amdgpu: Fixed drm.h include.

[akulichalexander]

From: Alexandr Akulich <akulichalexander@gmail.com>

The include type changed from system to own.

Signed-off-by: Alexandr Akulich <akulichalexander@gmail.com>
---
 include/drm/amdgpu_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index b6fce90..25e9b0a 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/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.4.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Michel Dänzer]

On 17.07.2015 05:19, akulichalexander@gmail.com wrote:
> From: Alexandr Akulich <akulichalexander@gmail.com>
> 
> The include type changed from system to own.
> 
> Signed-off-by: Alexandr Akulich <akulichalexander@gmail.com>
> ---
>  include/drm/amdgpu_drm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
> index b6fce90..25e9b0a 100644
> --- a/include/drm/amdgpu_drm.h
> +++ b/include/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
> 

It should be

#include <drm.h>

<drm/drm.h> is wrong because that's the path of the kernel header, which
not every distro ships.

"drm.h" is wrong because amdgpu_drm.h is used by other projects.


-- 
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

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Alexandr Akulich]

As I see, this is not a kernel header, but a local (belongs to libdrm) one.
(Otherwise, I would like you to point me on such file at, say,
https://github.com/torvalds/linux/tree/master/include/drm)

At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have

#include "drm.h"

At the same time, at i915_drm.h and tegra_drm.h. we have

#include <drm.h>

I'm pretty sure that the first case is correct, because drm.h is
always would be local file (in the same directory), related to
amdgpu_drm.h, and that is why local include "drm.h" would be always
valid.

This fixes libdrm build with amdgpu support on bare system for me.


On Fri, Jul 17, 2015 at 2:13 PM, Michel Dänzer <michel@daenzer.net> wrote:
> On 17.07.2015 05:19, akulichalexander@gmail.com wrote:
>> From: Alexandr Akulich <akulichalexander@gmail.com>
>>
>> The include type changed from system to own.
>>
>> Signed-off-by: Alexandr Akulich <akulichalexander@gmail.com>
>> ---
>>  include/drm/amdgpu_drm.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
>> index b6fce90..25e9b0a 100644
>> --- a/include/drm/amdgpu_drm.h
>> +++ b/include/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
>>
>
> It should be
>
> #include <drm.h>
>
> <drm/drm.h> is wrong because that's the path of the kernel header, which
> not every distro ships.
>
> "drm.h" is wrong because amdgpu_drm.h is used by other projects.
>
>
> --
> 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

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Michel Dänzer]

On 17.07.2015 22:33, Alexandr Akulich wrote:
> As I see, this is not a kernel header, but a local (belongs to libdrm) one.
> (Otherwise, I would like you to point me on such file at, say,
> https://github.com/torvalds/linux/tree/master/include/drm)

https://github.com/torvalds/linux/blob/master/include/uapi/drm/amdgpu_drm.h


> At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have
> 
> #include "drm.h"
> 
> At the same time, at i915_drm.h and tegra_drm.h. we have
> 
> #include <drm.h>
> 
> I'm pretty sure that the first case is correct, because drm.h is
> always would be local file (in the same directory), related to
> amdgpu_drm.h, and that is why local include "drm.h" would be always
> valid.

Makes sense to me, the patch is

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>


> This fixes libdrm build with amdgpu support on bare system for me.

FWIW though, that's because you're dropping the drm/ prefix, not because
you're changing from <> to "".


-- 
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

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Alexandr Akulich]

On Wed, Jul 22, 2015 at 1:19 PM, Michel Dänzer <michel@daenzer.net> wrote:
> On 17.07.2015 22:33, Alexandr Akulich wrote:
>> As I see, this is not a kernel header, but a local (belongs to libdrm) one.
>> (Otherwise, I would like you to point me on such file at, say,
>> https://github.com/torvalds/linux/tree/master/include/drm)
>
> https://github.com/torvalds/linux/blob/master/include/uapi/drm/amdgpu_drm.h
>
>
>> At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have
>>
>> #include "drm.h"
>>
>> At the same time, at i915_drm.h and tegra_drm.h. we have
>>
>> #include <drm.h>
>>
>> I'm pretty sure that the first case is correct, because drm.h is
>> always would be local file (in the same directory), related to
>> amdgpu_drm.h, and that is why local include "drm.h" would be always
>> valid.
>
> Makes sense to me, the patch is
>
> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Thanks! I have no write access to this fd.o repository. Can you apply it please?
>
>> This fixes libdrm build with amdgpu support on bare system for me.
>
> FWIW though, that's because you're dropping the drm/ prefix, not because
> you're changing from <> to "".
I know :-). Compiler would "fallback" from <> to "", if it can't find
a header in passed include directories.
>
> --
> 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

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Alexandr Akulich]

>> Makes sense to me, the patch is
>>
>> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
> Thanks! I have no write access to this fd.o repository. Can you apply it please?
I mean "apply the patch".
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Michel Dänzer]

On 22.07.2015 16:33, Alexandr Akulich wrote:
> On Wed, Jul 22, 2015 at 1:19 PM, Michel Dänzer <michel@daenzer.net> wrote:
>> On 17.07.2015 22:33, Alexandr Akulich wrote:
>>> As I see, this is not a kernel header, but a local (belongs to libdrm) one.
>>> (Otherwise, I would like you to point me on such file at, say,
>>> https://github.com/torvalds/linux/tree/master/include/drm)
>>
>> https://github.com/torvalds/linux/blob/master/include/uapi/drm/amdgpu_drm.h
>>
>>
>>> At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have
>>>
>>> #include "drm.h"
>>>
>>> At the same time, at i915_drm.h and tegra_drm.h. we have
>>>
>>> #include <drm.h>
>>>
>>> I'm pretty sure that the first case is correct, because drm.h is
>>> always would be local file (in the same directory), related to
>>> amdgpu_drm.h, and that is why local include "drm.h" would be always
>>> valid.
>>
>> Makes sense to me, the patch is
>>
>> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
> Thanks! I have no write access to this fd.o repository. Can you apply it please?

I assume your patch is against the amdgpu branch of
http://cgit.freedesktop.org/~agd5f/drm/, right? Only Alex Deucher has
write access to that.


-- 
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

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Alexandr Akulich]

On Wed, Jul 22, 2015 at 1:20 PM, Michel Dänzer <michel@daenzer.net> wrote:
> On 22.07.2015 16:33, Alexandr Akulich wrote:
>> On Wed, Jul 22, 2015 at 1:19 PM, Michel Dänzer <michel@daenzer.net> wrote:
>>> On 17.07.2015 22:33, Alexandr Akulich wrote:
>>>> As I see, this is not a kernel header, but a local (belongs to libdrm) one.
>>>> (Otherwise, I would like you to point me on such file at, say,
>>>> https://github.com/torvalds/linux/tree/master/include/drm)
>>>
>>> https://github.com/torvalds/linux/blob/master/include/uapi/drm/amdgpu_drm.h
>>>
>>>
>>>> At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have
>>>>
>>>> #include "drm.h"
>>>>
>>>> At the same time, at i915_drm.h and tegra_drm.h. we have
>>>>
>>>> #include <drm.h>
>>>>
>>>> I'm pretty sure that the first case is correct, because drm.h is
>>>> always would be local file (in the same directory), related to
>>>> amdgpu_drm.h, and that is why local include "drm.h" would be always
>>>> valid.
>>>
>>> Makes sense to me, the patch is
>>>
>>> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
>> Thanks! I have no write access to this fd.o repository. Can you apply it please?
>
> I assume your patch is against the amdgpu branch of
> http://cgit.freedesktop.org/~agd5f/drm/, right? Only Alex Deucher has
> write access to that.

Well, what I can do?
Alex, can you apply the patch, please?
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] libdrm/amdgpu: Fixed drm.h include.

[Alex Deucher]

On Tue, Jul 28, 2015 at 10:35 PM, Alexandr Akulich
<akulichalexander@gmail.com> wrote:
> On Wed, Jul 22, 2015 at 1:20 PM, Michel Dänzer <michel@daenzer.net> wrote:
>> On 22.07.2015 16:33, Alexandr Akulich wrote:
>>> On Wed, Jul 22, 2015 at 1:19 PM, Michel Dänzer <michel@daenzer.net> wrote:
>>>> On 17.07.2015 22:33, Alexandr Akulich wrote:
>>>>> As I see, this is not a kernel header, but a local (belongs to libdrm) one.
>>>>> (Otherwise, I would like you to point me on such file at, say,
>>>>> https://github.com/torvalds/linux/tree/master/include/drm)
>>>>
>>>> https://github.com/torvalds/linux/blob/master/include/uapi/drm/amdgpu_drm.h
>>>>
>>>>
>>>>> At files drm_sarea.h, mga_drm.h, qxl_drm.h, radeon_drm.h and via_drm.h we have
>>>>>
>>>>> #include "drm.h"
>>>>>
>>>>> At the same time, at i915_drm.h and tegra_drm.h. we have
>>>>>
>>>>> #include <drm.h>
>>>>>
>>>>> I'm pretty sure that the first case is correct, because drm.h is
>>>>> always would be local file (in the same directory), related to
>>>>> amdgpu_drm.h, and that is why local include "drm.h" would be always
>>>>> valid.
>>>>
>>>> Makes sense to me, the patch is
>>>>
>>>> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
>>> Thanks! I have no write access to this fd.o repository. Can you apply it please?
>>
>> I assume your patch is against the amdgpu branch of
>> http://cgit.freedesktop.org/~agd5f/drm/, right? Only Alex Deucher has
>> write access to that.
>
> Well, what I can do?
> Alex, can you apply the patch, please?

Applied.  thanks!

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