diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2020-04-25 20:03:15 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-27 12:27:02 +0000 |
| commit | 531728d6cbf0eb7d87698b9f03d0083ca0e2a7c0 (patch) | |
| tree | 306812c979c35bf8449cc08e5c0b7484be06f7e5 /src/amd/vulkan | |
| parent | 03ba57c6c53214b19aa0fdb66c680f2cadc3bbd9 (diff) | |
drm-uapi,radv,radeonsi: Add amdgpu_drm.h header.
Use it instead of the libdrm provided amdgpu_drm.h header. I used
the kernel revision from the README to get the header so the
header versions should be consistent.
Tested by removing /usr/include/libdrm/amdgpu_drm.h from my dev-machine.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4749>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_rgp.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_wsi_display.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index bae75e90558..b51d7325df8 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -50,7 +50,7 @@ #include "vk_util.h" #include <xf86drm.h> #include <amdgpu.h> -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #include "winsys/amdgpu/radv_amdgpu_winsys_public.h" #include "winsys/null/radv_null_winsys_public.h" #include "ac_llvm_util.h" diff --git a/src/amd/vulkan/radv_rgp.c b/src/amd/vulkan/radv_rgp.c index cea3ad0e8cb..94253aae6d9 100644 --- a/src/amd/vulkan/radv_rgp.c +++ b/src/amd/vulkan/radv_rgp.c @@ -27,7 +27,7 @@ #include "util/u_process.h" -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #define SQTT_FILE_MAGIC_NUMBER 0x50303042 #define SQTT_FILE_VERSION_MAJOR 1 diff --git a/src/amd/vulkan/radv_wsi_display.c b/src/amd/vulkan/radv_wsi_display.c index 101da601ee5..af2faab0994 100644 --- a/src/amd/vulkan/radv_wsi_display.c +++ b/src/amd/vulkan/radv_wsi_display.c @@ -32,7 +32,7 @@ #include <xf86drm.h> #include <xf86drmMode.h> #include <amdgpu.h> -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #include "winsys/amdgpu/radv_amdgpu_winsys_public.h" #include "vk_format.h" #include "sid.h" diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c index bfade961d94..f60d11fd85a 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c @@ -31,7 +31,7 @@ #include "radv_amdgpu_bo.h" #include <amdgpu.h> -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #include <inttypes.h> #include <pthread.h> #include <unistd.h> diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index b4533bb4dc7..c4bcdb9ec92 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <amdgpu.h> -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #include <assert.h> #include <pthread.h> #include <errno.h> diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index 77de0083498..acb003e1533 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -33,7 +33,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <amdgpu_drm.h> +#include "drm-uapi/amdgpu_drm.h" #include <assert.h> #include "radv_amdgpu_cs.h" #include "radv_amdgpu_bo.h" |