From 1db7eed69fa974563abc6d7348ee93b679c06cc3 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 4 Nov 2025 14:41:52 +0000 Subject: [PATCH] amdgpu: use local kernel headers instead of libdrm Use local copies of amdgpu and DRM headers for consistency. Signed-off-by: Radostin Stoyanov --- plugins/amdgpu/amdgpu_plugin.c | 2 +- plugins/amdgpu/amdgpu_plugin_drm.c | 2 ++ plugins/amdgpu/kfd_ioctl.h | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c index 36dc0b6b0..713ffed6e 100644 --- a/plugins/amdgpu/amdgpu_plugin.c +++ b/plugins/amdgpu/amdgpu_plugin.c @@ -20,7 +20,6 @@ #include #include -#include #include "criu-plugin.h" #include "plugin.h" @@ -38,6 +37,7 @@ #include "rst-malloc.h" #include "common/list.h" +#include "amdgpu_drm.h" #include "amdgpu_plugin_dmabuf.h" #include "amdgpu_plugin_drm.h" #include "amdgpu_plugin_util.h" diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c index 923bfcdd1..3520bca7a 100644 --- a/plugins/amdgpu/amdgpu_plugin_drm.c +++ b/plugins/amdgpu/amdgpu_plugin_drm.c @@ -23,6 +23,8 @@ #include "fdstore.h" #include "criu-amdgpu.pb-c.h" + +/* Define __user as empty for kernel headers in user-space */ #define __user #include "drm.h" diff --git a/plugins/amdgpu/kfd_ioctl.h b/plugins/amdgpu/kfd_ioctl.h index 1a3bcea95..a63d453f0 100644 --- a/plugins/amdgpu/kfd_ioctl.h +++ b/plugins/amdgpu/kfd_ioctl.h @@ -23,9 +23,12 @@ #ifndef KFD_IOCTL_H_INCLUDED #define KFD_IOCTL_H_INCLUDED -#include #include +/* Define __user as empty for kernel headers in user-space */ +#define __user +#include "drm.h" + /* * - 1.1 - initial version * - 1.3 - Add SMI events support