From: Emil Velikov <emil.veli...@collabora.com> Add a couple of forward declarations and drop the amdgpu.h requirement.
With this we can build the r300 and r600 drivers without the need for amdgpu. v2: - Add amdgpu.h include in the C file (Marek) - Add a comment about pre C11 typedef redeclaration warning (Eric) Cc: Nicolai Hähnle <nicolai.haeh...@amd.com> Cc: Marek Olšák <marek.ol...@amd.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101189 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> --- src/amd/common/ac_gpu_info.c | 2 ++ src/amd/common/ac_gpu_info.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 56645c48632..26868855148 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -34,6 +34,8 @@ #include <xf86drm.h> #include <amdgpu_drm.h> +#include <amdgpu.h> + #define CIK_TILE_MODE_COLOR_2D 14 #define CIK__GB_TILE_MODE__PIPE_CONFIG(x) (((x) >> 6) & 0x1f) diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 3f7ade1a0bb..a72ab58f9a3 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -28,12 +28,14 @@ #include "amd_family.h" -#include <amdgpu.h> - #ifdef __cplusplus extern "C" { #endif +/* Prior to C11 the following may trigger a typedef redeclaration warning */ +typedef void * amdgpu_device_handle; +struct amdgpu_gpu_info; + struct radeon_info { /* PCI info: domain:bus:dev:func */ uint32_t pci_domain; -- 2.12.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
