diff options
| author | Emil Velikov <[email protected]> | 2017-05-29 14:50:47 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-06-16 12:41:44 +0100 |
| commit | 81945ded0dc3d25d55eaf682dce220fa4c2de9fe (patch) | |
| tree | e6b9d6d5ae8114d0f08c7980c6a2596565844744 /src/amd | |
| parent | d96a210842bf643716ebceb5aba5c92a564aab14 (diff) | |
ac: remove amdgpu.h dependency
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 <[email protected]>
Cc: Marek Olšák <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101189
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 2 | ||||
| -rw-r--r-- | 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 7d6f6e7d8ac..3f39a089ecb 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; |