[Bug,101189] Latest git fails to compile with radeon
diff mbox

Message ID bug-101189-502-blcOgcTqwZ@http.bugs.freedesktop.org/
State New
Headers show

Commit Message

bugzilla-daemon@freedesktop.org June 17, 2017, 6:44 a.m. UTC
https://bugs.freedesktop.org/show_bug.cgi?id=101189

--- Comment #19 from Mauro Rossi <issor.oruam@gmail.com> ---
Hi, 

with current patch "ac: remove amdgpu.h dependency" applied,
on Android (nougat-x86) I get the following building errors:

In file included from external/mesa/src/amd/common/ac_gpu_info.c:26:
external/mesa/src/amd/common/ac_gpu_info.h:41:2: error: unknown type name
'uint32_t'
        uint32_t                    pci_domain;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:42:2: error: unknown type name
'uint32_t'
        uint32_t                    pci_bus;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:43:2: error: unknown type name
'uint32_t'
        uint32_t                    pci_dev;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:44:2: error: unknown type name
'uint32_t'
        uint32_t                    pci_func;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:47:2: error: unknown type name
'uint32_t'
        uint32_t                    pci_id;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:50:2: error: unknown type name
'uint32_t'
        uint32_t                    pte_fragment_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:51:2: error: unknown type name
'uint32_t'
        uint32_t                    gart_page_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:52:2: error: unknown type name
'uint64_t'
        uint64_t                    gart_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:53:2: error: unknown type name
'uint64_t'
        uint64_t                    vram_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:54:2: error: unknown type name
'uint64_t'
        uint64_t                    vram_vis_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:55:2: error: unknown type name
'uint64_t'
        uint64_t                    max_alloc_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:56:2: error: unknown type name
'uint32_t'
        uint32_t                    min_alloc_size;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:57:2: error: unknown type name
'bool'
        bool                        has_dedicated_vram;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:58:2: error: unknown type name
'bool'
        bool                        has_virtual_memory;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:59:2: error: unknown type name
'bool'
        bool                        gfx_ib_pad_with_type2;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:60:2: error: unknown type name
'bool'
        bool                        has_hw_decode;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:61:2: error: unknown type name
'uint32_t'
        uint32_t                    num_sdma_rings;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:62:2: error: unknown type name
'uint32_t'
        uint32_t                    num_compute_rings;
        ^
external/mesa/src/amd/common/ac_gpu_info.h:63:2: error: unknown type name
'uint32_t'
        uint32_t                    uvd_fw_version;
        ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.


The following changes are necessary in src/amd/common/ac_gpu_info.h

utente@utente-System-Product-Name:~/nougat-x86/external/mesa$ git diff


Having applied that I still get the following build error:

In file included from external/mesa/src/amd/common/ac_surface.c:38:
external/libdrm/amdgpu/amdgpu.h:107:31: error: typedef redefinition with
different types ('struct amdgpu_device *' vs 'void *')
typedef struct amdgpu_device *amdgpu_device_handle;
                              ^
1 error generated.


Could you please check on the latter and provide corrective patch?
I am available to test build on nougat-x86

Thanks

Mauro

Patch
diff mbox

diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h
index a72ab58f9a..616a1df7fa 100644
--- a/src/amd/common/ac_gpu_info.h
+++ b/src/amd/common/ac_gpu_info.h
@@ -26,6 +26,9 @@ 
 #ifndef AC_GPU_INFO_H
 #define AC_GPU_INFO_H

+#include <stdint.h>
+#include <stdbool.h>
+
 #include "amd_family.h"

 #ifdef __cplusplus