From 2a4c8ad75cd595cec3aa181f911fea75d3ec6803 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 27 Aug 2020 06:42:13 +0000 Subject: bring back local #undef DEBUG changes lost in drm 5.7 update fixes errors building with option DEBUG reported by phessler@ --- sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c | 4 ++++ sys/dev/pci/drm/radeon/atom.c | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'sys/dev/pci') diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c index ad42114257b..751fe647c8a 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c @@ -94,6 +94,10 @@ static void debug_print_spaces(int n) printk(" "); } +#ifdef DEBUG +#undef DEBUG +#endif + #define DEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG __VA_ARGS__); } while (0) #define SDEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG); debug_print_spaces(debug_depth); printk(__VA_ARGS__); } while (0) #else diff --git a/sys/dev/pci/drm/radeon/atom.c b/sys/dev/pci/drm/radeon/atom.c index f4852aea9ec..ec88b70f5b4 100644 --- a/sys/dev/pci/drm/radeon/atom.c +++ b/sys/dev/pci/drm/radeon/atom.c @@ -97,6 +97,10 @@ static void debug_print_spaces(int n) printk(" "); } +#ifdef DEBUG +#undef DEBUG +#endif + #define DEBUG(...) do if (atom_debug) { printk(KERN_DEBUG __VA_ARGS__); } while (0) #define SDEBUG(...) do if (atom_debug) { printk(KERN_DEBUG); debug_print_spaces(debug_depth); printk(__VA_ARGS__); } while (0) #else -- cgit v1.2.3