fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 00:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac: remove amdgpu.h dependency

Browse source 
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.haehnle@amd.com>
Cc: Marek Olšák <marek.olsak@amd.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101189
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2017-05-29 14:50:47 +01:00 • committed by Emil Velikov
parent d96a210842
commit 81945ded0d
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/common/ac_gpu_info.c
View file

@ -34,6 +34,8 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <amdgpu_drm.h> #include <amdgpu_drm.h>
#include <amdgpu.h>
#define CIK_TILE_MODE_COLOR_2D 14 #define CIK_TILE_MODE_COLOR_2D 14
#define CIK__GB_TILE_MODE__PIPE_CONFIG(x) (((x) >> 6) & 0x1f) #define CIK__GB_TILE_MODE__PIPE_CONFIG(x) (((x) >> 6) & 0x1f)

6
src/amd/common/ac_gpu_info.h
View file

@ -28,12 +28,14 @@
#include "amd_family.h" #include "amd_family.h"
#include <amdgpu.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Prior to C11 the following may trigger a typedef redeclaration warning */
typedef void * amdgpu_device_handle;
struct amdgpu_gpu_info;
struct radeon_info { struct radeon_info {
/* PCI info: domain:bus:dev:func */ /* PCI info: domain:bus:dev:func */
uint32_t pci_domain; uint32_t pci_domain;