[PATCH] android: amdgpu: move asic id table to a separate file

[PATCH] android: amdgpu: move asic id table to a separate file

[Mauro Rossi]

Changes in Android.mk makefile to avoid building errors in mesa
due to missing LOCAL_CFLAGS variable definition for
AMDGPU_ASIC_ID_TABLE and ASIC_ID_TABLE_NUM_ENTRIES

Fixes: 7e6bf88cac ("amdgpu: move asic id table to a separate file")
---
 amdgpu/Android.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611ba..270680bb 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -10,5 +10,13 @@ LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
+	$(LIBDRM_TOP)/data/amdgpu.ids)
+
+LOCAL_CFLAGS += -DAMDGPU_ASIC_ID_TABLE=\"$(LIBDRM_TOP)/data/amdgpu.ids\" \
+	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
+
+$(intermediates)/amdgpu_asic_id.o: $(LIBDRM_TOP)/data/amdgpu.ids
+
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
-- 
2.11.0

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

Re: [PATCH] android: amdgpu: move asic id table to a separate file

[Mauro Rossi]

Hi,

after git-send I noticed that libdrm patches in drii-devel are
prefixed by [ PATCH libdrm ]

Please consider that this is a libdrm patch.
Mauro


2017-07-22 11:01 GMT+02:00 Mauro Rossi <issor.oruam@gmail.com>:
> Changes in Android.mk makefile to avoid building errors in mesa
> due to missing LOCAL_CFLAGS variable definition for
> AMDGPU_ASIC_ID_TABLE and ASIC_ID_TABLE_NUM_ENTRIES
>
> Fixes: 7e6bf88cac ("amdgpu: move asic id table to a separate file")
> ---
>  amdgpu/Android.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
> index bf0611ba..270680bb 100644
> --- a/amdgpu/Android.mk
> +++ b/amdgpu/Android.mk
> @@ -10,5 +10,13 @@ LOCAL_SHARED_LIBRARIES := libdrm
>
>  LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
>
> +ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
> +       $(LIBDRM_TOP)/data/amdgpu.ids)
> +
> +LOCAL_CFLAGS += -DAMDGPU_ASIC_ID_TABLE=\"$(LIBDRM_TOP)/data/amdgpu.ids\" \
> +       -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
> +
> +$(intermediates)/amdgpu_asic_id.o: $(LIBDRM_TOP)/data/amdgpu.ids
> +
>  include $(LIBDRM_COMMON_MK)
>  include $(BUILD_SHARED_LIBRARY)
> --
> 2.11.0
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] android: amdgpu: move asic id table to a separate file

[Chih-Wei Huang]

2017-07-22 17:01 GMT+08:00 Mauro Rossi <issor.oruam@gmail.com>:
> Changes in Android.mk makefile to avoid building errors in mesa
> due to missing LOCAL_CFLAGS variable definition for
> AMDGPU_ASIC_ID_TABLE and ASIC_ID_TABLE_NUM_ENTRIES
>
> Fixes: 7e6bf88cac ("amdgpu: move asic id table to a separate file")
> ---
>  amdgpu/Android.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
> index bf0611ba..270680bb 100644
> --- a/amdgpu/Android.mk
> +++ b/amdgpu/Android.mk
> @@ -10,5 +10,13 @@ LOCAL_SHARED_LIBRARIES := libdrm
>
>  LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
>
> +ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
> +       $(LIBDRM_TOP)/data/amdgpu.ids)
> +
> +LOCAL_CFLAGS += -DAMDGPU_ASIC_ID_TABLE=\"$(LIBDRM_TOP)/data/amdgpu.ids\" \
> +       -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)

Hi Mauro,
Please note AMDGPU_ASIC_ID_TABLE
should be a path in the target device (i.e., Android).
So using $(LIBDRM_TOP) is incorrect.

Actually I've sent a fix for it about one week ago.

> +$(intermediates)/amdgpu_asic_id.o: $(LIBDRM_TOP)/data/amdgpu.ids
> +
>  include $(LIBDRM_COMMON_MK)
>  include $(BUILD_SHARED_LIBRARY)
> --


-- 
Chih-Wei
Android-x86 project
http://www.android-x86.org
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] android: amdgpu: move asic id table to a separate file

[Emil Velikov]

On 25 July 2017 at 08:28, Chih-Wei Huang <cwhuang@android-x86.org> wrote:
> 2017-07-22 17:01 GMT+08:00 Mauro Rossi <issor.oruam@gmail.com>:
>> Changes in Android.mk makefile to avoid building errors in mesa
>> due to missing LOCAL_CFLAGS variable definition for
>> AMDGPU_ASIC_ID_TABLE and ASIC_ID_TABLE_NUM_ENTRIES
>>
>> Fixes: 7e6bf88cac ("amdgpu: move asic id table to a separate file")
>> ---
>>  amdgpu/Android.mk | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
>> index bf0611ba..270680bb 100644
>> --- a/amdgpu/Android.mk
>> +++ b/amdgpu/Android.mk
>> @@ -10,5 +10,13 @@ LOCAL_SHARED_LIBRARIES := libdrm
>>
>>  LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
>>
>> +ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
>> +       $(LIBDRM_TOP)/data/amdgpu.ids)
>> +
>> +LOCAL_CFLAGS += -DAMDGPU_ASIC_ID_TABLE=\"$(LIBDRM_TOP)/data/amdgpu.ids\" \
>> +       -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
>
> Hi Mauro,
> Please note AMDGPU_ASIC_ID_TABLE
> should be a path in the target device (i.e., Android).
> So using $(LIBDRM_TOP) is incorrect.
>
> Actually I've sent a fix for it about one week ago.
>
Did you sent v2 of the patch? I cannot see any in my inbox.

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] android: amdgpu: move asic id table to a separate file

[Chih-Wei Huang]

> 2017-07-26 17:27 GMT+02:00 Emil Velikov <emil.l.velikov@gmail.com>:
>> On 25 July 2017 at 08:28, Chih-Wei Huang <cwhuang@android-x86.org> wrote:
>>> Hi Mauro,
>>> Please note AMDGPU_ASIC_ID_TABLE
>>> should be a path in the target device (i.e., Android).
>>> So using $(LIBDRM_TOP) is incorrect.
>>>
>>> Actually I've sent a fix for it about one week ago.
>>>
>> Did you sent v2 of the patch? I cannot see any in my inbox.

OK. I re-submitted v2 patch to replace
/etc with /system/etc.

2017-07-27 1:36 GMT+08:00 Mauro Rossi <issor.oruam@gmail.com>:
> This one has conceptual error and is to be dropped.
>
> The ones submitted by Chih-Wei are here:
>
> https://github.com/maurossi/drm/commits/2.4.82_android-x86
>
> where in the (v2) of the second I just replaced /etc path with $(TARGET_OUT_ETC)

No. TARGET_OUT_ETC is still the host path.
(which is out/target/product/$target/system/etc )

> Chih-Wei if you like the (v2) could you please resubmit to dri-devel
> using [PATCH libdrm] in the title?

-- 
Chih-Wei
Android-x86 project
http://www.android-x86.org
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] android: amdgpu: move asic id table to a separate file

[Mauro Rossi]

2017-07-27 10:30 GMT+02:00 Chih-Wei Huang <cwhuang@android-x86.org>:
>> 2017-07-26 17:27 GMT+02:00 Emil Velikov <emil.l.velikov@gmail.com>:
>>> On 25 July 2017 at 08:28, Chih-Wei Huang <cwhuang@android-x86.org> wrote:
>>>> Hi Mauro,
>>>> Please note AMDGPU_ASIC_ID_TABLE
>>>> should be a path in the target device (i.e., Android).
>>>> So using $(LIBDRM_TOP) is incorrect.
>>>>
>>>> Actually I've sent a fix for it about one week ago.
>>>>
>>> Did you sent v2 of the patch? I cannot see any in my inbox.
>
> OK. I re-submitted v2 patch to replace
> /etc with /system/etc.
>
> 2017-07-27 1:36 GMT+08:00 Mauro Rossi <issor.oruam@gmail.com>:
>> This one has conceptual error and is to be dropped.
>>
>> The ones submitted by Chih-Wei are here:
>>
>> https://github.com/maurossi/drm/commits/2.4.82_android-x86
>>
>> where in the (v2) of the second I just replaced /etc path with $(TARGET_OUT_ETC)
>
> No. TARGET_OUT_ETC is still the host path.
> (which is out/target/product/$target/system/etc )

I had this kind of doubt,
I think there is a precedent we can use to support original 2of2 patch (v1)

https://github.com/robherring/libpciaccess/blob/master/Android.mk

where /etc/hwdata was the folder used at runtime for pci.ids

So original 2of2 patch is signed-off by Chih-Wei and me.

Mauro

>
>> Chih-Wei if you like the (v2) could you please resubmit to dri-devel
>> using [PATCH libdrm] in the title?
>
> --
> Chih-Wei
> Android-x86 project
> http://www.android-x86.org
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel