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 <marek.olsak@amd.com> Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4749>
This commit is contained in:

committed by
Marge Bot

parent
03ba57c6c5
commit
531728d6cb
1073
include/drm-uapi/amdgpu_drm.h
Normal file
1073
include/drm-uapi/amdgpu_drm.h
Normal file
File diff suppressed because it is too large
Load Diff
@@ -33,7 +33,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include <xf86drm.h>
|
||||
#include <amdgpu_drm.h>
|
||||
#include "drm-uapi/amdgpu_drm.h"
|
||||
|
||||
#include <amdgpu.h>
|
||||
|
||||
|
@@ -37,7 +37,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <amdgpu.h>
|
||||
#include <amdgpu_drm.h>
|
||||
#include "drm-uapi/amdgpu_drm.h"
|
||||
|
||||
#include "addrlib/inc/addrinterface.h"
|
||||
|
||||
|
@@ -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"
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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>
|
||||
|
@@ -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>
|
||||
|
@@ -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"
|
||||
|
@@ -31,7 +31,7 @@
|
||||
#include "util/os_time.h"
|
||||
#include "util/u_hash_table.h"
|
||||
#include "state_tracker/drm_driver.h"
|
||||
#include <amdgpu_drm.h>
|
||||
#include "drm-uapi/amdgpu_drm.h"
|
||||
#include <xf86drm.h>
|
||||
#include <stdio.h>
|
||||
#include <inttypes.h>
|
||||
|
@@ -30,7 +30,7 @@
|
||||
|
||||
#include "amdgpu_bo.h"
|
||||
#include "util/u_memory.h"
|
||||
#include <amdgpu_drm.h>
|
||||
#include "drm-uapi/amdgpu_drm.h"
|
||||
|
||||
struct amdgpu_ctx {
|
||||
struct amdgpu_winsys *ws;
|
||||
|
@@ -36,7 +36,7 @@
|
||||
#include "util/u_hash_table.h"
|
||||
#include "util/hash_table.h"
|
||||
#include "util/xmlconfig.h"
|
||||
#include <amdgpu_drm.h>
|
||||
#include "drm-uapi/amdgpu_drm.h"
|
||||
#include <xf86drm.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
|
Reference in New Issue
Block a user