From 331f44820e0a3747b1734cf5ae1ef44a5dd0c6c9 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Sat, 14 Nov 2020 09:27:49 +1100 Subject: [PATCH] [amd] common: remove useless dependency on DRM --- src/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- src/amd/amdgpu/amdgpu_bios.c | 2 +- src/amd/amdgpu/amdgpu_discovery.c | 2 +- src/amd/common.h | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/amd/amdgpu/amdgpu_atomfirmware.c b/src/amd/amdgpu/amdgpu_atomfirmware.c index cd462ad..b1d6a77 100644 --- a/src/amd/amdgpu/amdgpu_atomfirmware.c +++ b/src/amd/amdgpu/amdgpu_atomfirmware.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include +//#include #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" diff --git a/src/amd/amdgpu/amdgpu_bios.c b/src/amd/amdgpu/amdgpu_bios.c index b44bbce..97e5bf0 100644 --- a/src/amd/amdgpu/amdgpu_bios.c +++ b/src/amd/amdgpu/amdgpu_bios.c @@ -33,7 +33,7 @@ #include #include #include -#include +//#include /* * BIOS. */ diff --git a/src/amd/amdgpu/amdgpu_discovery.c b/src/amd/amdgpu/amdgpu_discovery.c index 064b8c6..20a7a88 100644 --- a/src/amd/amdgpu/amdgpu_discovery.c +++ b/src/amd/amdgpu/amdgpu_discovery.c @@ -21,7 +21,7 @@ * */ -#include +//#include #include "common.h" #include "amdgpu_device.h" #include "amdgpu_discovery.h" diff --git a/src/amd/common.h b/src/amd/common.h index fc5593e..07f5e7c 100644 --- a/src/amd/common.h +++ b/src/amd/common.h @@ -23,6 +23,12 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include "vendor-reset-dev.h" +/* these are to remove the dependency on DRM */ +#define DRM_INFO(fmt, args...) pr_info("vendor-reset-drm: " fmt, ##args) +#define DRM_ERROR(fmt, args...) pr_err("vendor-reset-drm: " fmt, ##args) +#define DRM_DEBUG(fmt, args...) pr_debug("vendor-reset-drm: " fmt, ##args) + + #define RREG32(reg) \ ({ \ u32 __out; \