drm/amdkcl: drop individual tests for header files

Change-Id: Ibf7a76190a7dd84dc6776573f62f7784793f2303
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Reviewed-by: Flora Cui <flora.cui@amd.com>

28 files changed, 247 insertions, 411 deletions

diff --git a/drivers/gpu/drm/amd/amdkcl/kcl_drm.c b/drivers/gpu/drm/amd/amdkcl/kcl_drm.c
index e881ff0cc3ff..a28851372733 100644
--- a/drivers/gpu/drm/amd/amdkcl/kcl_drm.c
+++ b/drivers/gpu/drm/amd/amdkcl/kcl_drm.c
@@ -183,7 +183,7 @@ void drm_fb_helper_fill_info(struct fb_info *info,
 EXPORT_SYMBOL(drm_fb_helper_fill_info);
 #endif
 
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 void drm_printf(struct drm_printer *p, const char *f, ...)
 {
 	struct va_format vaf;
@@ -201,7 +201,7 @@ EXPORT_SYMBOL(drm_printf);
 #if !defined(HAVE_DRM_DEBUG_PRINTER)
 void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf)
 {
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 	pr_debug("%s %pV", p->prefix, vaf);
 #else
 	pr_debug("%s %pV", "no prefix < 4.11", vaf);
diff --git a/drivers/gpu/drm/amd/dkms/config/config.h b/drivers/gpu/drm/amd/dkms/config/config.h
index 1cced25408cb..ffa08d065b2e 100644
--- a/drivers/gpu/drm/amd/dkms/config/config.h
+++ b/drivers/gpu/drm/amd/dkms/config/config.h
@@ -34,9 +34,12 @@
 /* arch_io_{reserve/free}_memtype_wc() are available */
 /* #undef HAVE_ARCH_IO_RESERVE_FREE_MEMTYPE_WC */
 
-/* asm/fpu/api.h is available */
+/* Define to 1 if you have the <asm/fpu/api.h> header file. */
 #define HAVE_ASM_FPU_API_H 1
 
+/* Define to 1 if you have the <asm/set_memory.h> header file. */
+#define HAVE_ASM_SET_MEMORY_H 1
+
 /* attribute_group->bin_attrs is available */
 #define HAVE_ATTRIBUTE_GROUP_BIN_ATTRS 1
 
@@ -145,15 +148,9 @@
 /* drm_atomic_state_put() is available */
 #define HAVE_DRM_ATOMIC_STATE_PUT 1
 
-/* drm/drm_atomic_uapi.h is available */
-#define HAVE_DRM_ATOMIC_UAPI_HEADER 1
-
 /* whether drm/drm_audio_component.h is defined */
 #define HAVE_DRM_AUDIO_COMPONENT_HEADER 1
 
-/* drm/drm_auth.h is available */
-#define HAVE_DRM_AUTH_H 1
-
 /* drm_calc_vbltimestamp_from_scanoutpos() drop mode arg */
 /* #undef HAVE_DRM_CALC_VBLTIMESTAMP_FROM_SCANOUTPOS_DROP_MOD_ARG */
 
@@ -184,9 +181,6 @@
 /* struct drm_connector_funcs has register members */
 #define HAVE_DRM_CONNECTOR_FUNCS_REGISTER 1
 
-/* drm/drm_connector.h is available */
-#define HAVE_DRM_CONNECTOR_H 1
-
 /* drm_connector_helper_funcs->atomic_check() wants struct drm_atomic_state
    arg */
 #define HAVE_DRM_CONNECTOR_HELPER_FUNCS_ATOMIC_CHECK_ARG_DRM_ATOMIC_STATE 1
@@ -224,9 +218,6 @@
 /* drm_crtc_init_with_planes() wants name */
 #define HAVE_DRM_CRTC_INIT_WITH_PLANES_VALID_WITH_NAME 1
 
-/* drm/drm_debugfs.h is available */
-#define HAVE_DRM_DEBUGFS_H 1
-
 /* drm_debug_enabled() is available */
 #define HAVE_DRM_DEBUG_ENABLED 1
 
@@ -239,9 +230,6 @@
 /* drm_device->filelist_mutex is available */
 #define HAVE_DRM_DEVICE_FILELIST_MUTEX 1
 
-/* drm/drm_device.h is available */
-#define HAVE_DRM_DEVICE_H 1
-
 /* drm_device->open_count is int */
 /* #undef HAVE_DRM_DEVICE_OPEN_COUNT_INT */
 
@@ -308,12 +296,54 @@
 /* Define to 1 if you have the <drm/drmP.h> header file. */
 /* #undef HAVE_DRM_DRMP_H */
 
+/* Define to 1 if you have the <drm/drm_atomic_uapi.h> header file. */
+#define HAVE_DRM_DRM_ATOMIC_UAPI_H 1
+
+/* Define to 1 if you have the <drm/drm_auth.h> header file. */
+#define HAVE_DRM_DRM_AUTH_H 1
+
 /* Define to 1 if you have the <drm/drm_backport.h> header file. */
 /* #undef HAVE_DRM_DRM_BACKPORT_H */
 
+/* Define to 1 if you have the <drm/drm_connector.h> header file. */
+#define HAVE_DRM_DRM_CONNECTOR_H 1
+
+/* Define to 1 if you have the <drm/drm_debugfs.h> header file. */
+#define HAVE_DRM_DRM_DEBUGFS_H 1
+
+/* Define to 1 if you have the <drm/drm_device.h> header file. */
+#define HAVE_DRM_DRM_DEVICE_H 1
+
 /* Define to 1 if you have the <drm/drm_drv.h> header file. */
 #define HAVE_DRM_DRM_DRV_H 1
 
+/* Define to 1 if you have the <drm/drm_encoder.h> header file. */
+#define HAVE_DRM_DRM_ENCODER_H 1
+
+/* Define to 1 if you have the <drm/drm_file.h> header file. */
+#define HAVE_DRM_DRM_FILE_H 1
+
+/* Define to 1 if you have the <drm/drm_ioctl.h> header file. */
+#define HAVE_DRM_DRM_IOCTL_H 1
+
+/* Define to 1 if you have the <drm/drm_irq.h> header file. */
+#define HAVE_DRM_DRM_IRQ_H 1
+
+/* Define to 1 if you have the <drm/drm_plane.h> header file. */
+#define HAVE_DRM_DRM_PLANE_H 1
+
+/* Define to 1 if you have the <drm/drm_print.h> header file. */
+#define HAVE_DRM_DRM_PRINT_H 1
+
+/* Define to 1 if you have the <drm/drm_probe_helper.h> header file. */
+#define HAVE_DRM_DRM_PROBE_HELPER_H 1
+
+/* Define to 1 if you have the <drm/drm_util.h> header file. */
+#define HAVE_DRM_DRM_UTIL_H 1
+
+/* Define to 1 if you have the <drm/drm_vblank.h> header file. */
+#define HAVE_DRM_DRM_VBLANK_H 1
+
 /* drm_driver_feature DRIVER_ATOMIC is available */
 #define HAVE_DRM_DRV_DRIVER_ATOMIC 1
 
@@ -335,9 +365,6 @@
 /* drm_encoder_find() wants file_priv */
 #define HAVE_DRM_ENCODER_FIND_VALID_WITH_FILE 1
 
-/* drm/drm_encoder.h is available */
-#define HAVE_DRM_ENCODER_H 1
-
 /* drm_encoder_init() wants name */
 #define HAVE_DRM_ENCODER_INIT_VALID_WITH_NAME 1
 
@@ -375,9 +402,6 @@
 /* drm_fb_helper_{alloc/unregister}_fbi is available */
 #define HAVE_DRM_FB_HELPER_XX_FBI 1
 
-/* drm/drm_file.h is available */
-#define HAVE_DRM_FILE_H 1
-
 /* whether struct drm_framebuffer have format */
 #define HAVE_DRM_FRAMEBUFFER_FORMAT 1
 
@@ -417,12 +441,6 @@
 /* drm_helper_force_disable_all() is available */
 #define HAVE_DRM_HELPER_FORCE_DISABLE_ALL 1
 
-/* drm/drm_ioctl.h is available */
-#define HAVE_DRM_IOCTL_H 1
-
-/* drm/drm_irq.h is available */
-#define HAVE_DRM_IRQ_H 1
-
 /* drm_is_current_master() is available */
 #define HAVE_DRM_IS_CURRENT_MASTER 1
 
@@ -444,15 +462,6 @@
 /* drm_need_swiotlb() is availablea */
 #define HAVE_DRM_NEED_SWIOTLB 1
 
-/* drm/drm_plane.h is available */
-#define HAVE_DRM_PLANE_H 1
-
-/* drm/drm_print.h is available */
-#define HAVE_DRM_PRINT_H 1
-
-/* drm/drm_probe_helper.h is available */
-#define HAVE_DRM_PROBE_HELPER_H 1
-
 /* drm_send_event_locked() function is available */
 #define HAVE_DRM_SEND_EVENT_LOCKED 1
 
@@ -471,6 +480,9 @@
 /* whether drm_syncobj_find_fence() wants 5 args */
 #define HAVE_DRM_SYNCOBJ_FIND_FENCE_5ARGS 1
 
+/* Define to 1 if you have the <drm/task_barrier.h> header file. */
+#define HAVE_DRM_TASK_BARRIER_H 1
+
 /* drm_universal_plane_init() wants 7 args */
 /* #undef HAVE_DRM_UNIVERSAL_PLANE_INIT_7ARGS */
 
@@ -480,12 +492,6 @@
 /* drm_universal_plane_init() wants 9 args */
 #define HAVE_DRM_UNIVERSAL_PLANE_INIT_9ARGS 1
 
-/* drm/drm_util.h is available */
-#define HAVE_DRM_UTIL_H 1
-
-/* drm/drm_vblank.h is available */
-#define HAVE_DRM_VBLANK_H 1
-
 /* drm_vma_node_verify_access() 2nd argument is drm_file */
 #define HAVE_DRM_VMA_NODE_VERIFY_ACCESS_HAS_DRM_FILE 1
 
@@ -531,9 +537,6 @@
 /* idr_remove return void pointer */
 #define HAVE_IDR_REMOVE_RETURN_VOID_POINTER 1
 
-/* whether INTERVAL_TREE_DEFINE() is defined */
-#define HAVE_INTERVAL_TREE_DEFINE 1
-
 /* in_compat_syscall is defined */
 #define HAVE_IN_COMPAT_SYSCALL 1
 
@@ -546,9 +549,6 @@
 /* kallsyms_lookup_name is available */
 #define HAVE_KALLSYMS_LOOKUP_NAME 1
 
-/* kfifo_new.h is available */
-/* #undef HAVE_KFIFO_NEW_H */
-
 /* kmap_atomic() have one argument */
 #define HAVE_KMAP_ATOMIC_ONE_ARG 1
 
@@ -591,7 +591,7 @@
 /* kv[mz]alloc() are available */
 #define HAVE_KVZALLOC_KVMALLOC 1
 
-/* whether linux/bits.h is available */
+/* Define to 1 if you have the <linux/bits.h> header file. */
 #define HAVE_LINUX_BITS_H 1
 
 /* Define to 1 if you have the <linux/dma-fence.h> header file. */
@@ -600,12 +600,30 @@
 /* Define to 1 if you have the <linux/fence-array.h> header file. */
 /* #undef HAVE_LINUX_FENCE_ARRAY_H */
 
-/* linux/io-64-nonatomic-lo-hi.h is available */
+/* Define to 1 if you have the <linux/interval_tree_generic.h> header file. */
+#define HAVE_LINUX_INTERVAL_TREE_GENERIC_H 1
+
+/* Define to 1 if you have the <linux/io-64-nonatomic-lo-hi.h> header file. */
 #define HAVE_LINUX_IO_64_NONATOMIC_LO_HI_H 1
 
-/* linux/nospec.h is available */
+/* Define to 1 if you have the <linux/kfifo-new.h> header file. */
+/* #undef HAVE_LINUX_KFIFO_NEW_H */
+
+/* Define to 1 if you have the <linux/nospec.h> header file. */
 #define HAVE_LINUX_NOSPEC_H 1
 
+/* Define to 1 if you have the <linux/overflow.h> header file. */
+#define HAVE_LINUX_OVERFLOW_H 1
+
+/* Define to 1 if you have the <linux/sched/mm.h> header file. */
+#define HAVE_LINUX_SCHED_MM_H 1
+
+/* Define to 1 if you have the <linux/sched/signal.h> header file. */
+#define HAVE_LINUX_SCHED_SIGNAL_H 1
+
+/* Define to 1 if you have the <linux/sched/task.h> header file. */
+#define HAVE_LINUX_SCHED_TASK_H 1
+
 /* list_bulk_move_tail() is available */
 #define HAVE_LIST_BULK_MOVE_TAIL 1
 
@@ -636,18 +654,12 @@
 /* mm_access() is available */
 #define HAVE_MM_ACCESS 1
 
-/* linux/sched/mm.h is available */
-#define HAVE_MM_H 1
-
 /* release_pages() wants 2 args */
 #define HAVE_MM_RELEASE_PAGES_2ARGS 1
 
 /* num_u32_u32 is available */
 #define HAVE_MUL_U32_U32 1
 
-/* linux/overflow.h is available */
-#define HAVE_OVERFLOW_H 1
-
 /* pcie_bandwidth_available() is available */
 #define HAVE_PCIE_BANDWIDTH_AVAILABLE 1
 
@@ -702,21 +714,12 @@
 /* reservation_object->staged is dropped */
 /* #undef HAVE_RESERVATION_OBJECT_DROP_STAGED */
 
-/* sched/types.h is available */
-#define HAVE_SCHED_TYPES_H 1
-
 /* seq_hex_dump() is available */
 #define HAVE_SEQ_HEX_DUMP 1
 
 /* drm_driver have set_busid */
 /* #undef HAVE_SET_BUSID_IN_STRUCT_DRM_DRIVER */
 
-/* asm/set_memory.h is available */
-#define HAVE_SET_MEMORY_H 1
-
-/* linux/sched/signal.h is available */
-#define HAVE_SIGNAL_H 1
-
 /* whether si_mem_available() is available */
 #define HAVE_SI_MEM_AVAILABLE 1
 
@@ -768,12 +771,6 @@
 /* system_highpri_wq is exported */
 #define HAVE_SYSTEM_HIGHPRI_WQ_EXPORTED 1
 
-/* include/drm/task_barrier.h is available */
-#define HAVE_TASK_BARRIER_H 1
-
-/* linux/sched/task.h is available */
-#define HAVE_TASK_H 1
-
 /* timer_setup() is available */
 #define HAVE_TIMER_SETUP 1
 
@@ -783,6 +780,9 @@
 /* __poll_t is available */
 #define HAVE_TYPE__POLL_T 1
 
+/* Define to 1 if you have the <uapi/linux/sched/types.h> header file. */
+#define HAVE_UAPI_LINUX_SCHED_TYPES_H 1
+
 /* vga_switcheroo_handler->get_client_id() return int */
 /* #undef HAVE_VGA_SWITCHEROO_GET_CLIENT_ID_RETURN_INT */
 
diff --git a/drivers/gpu/drm/amd/dkms/m4/drm-headers.m4 b/drivers/gpu/drm/amd/dkms/m4/drm-headers.m4
index 1ed34d61363f..f201af547311 100644
--- a/drivers/gpu/drm/amd/dkms/m4/drm-headers.m4
+++ b/drivers/gpu/drm/amd/dkms/m4/drm-headers.m4
@@ -1,181 +1,111 @@
-dnl #
-dnl # commit v4.7-rc5-1465-g34a67dd7f33f
-dnl # drm: Extract&Document drm_irq.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_IRQ_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_irq.h], [
-		AC_DEFINE(HAVE_DRM_IRQ_H, 1, [drm/drm_irq.h is available])
-	])
-])
+AC_DEFUN([AC_AMDGPU_DRM_HEADERS], [
 
-dnl #
-dnl # commit v4.8-rc2-342-g522171951761
-dnl # drm: Extract drm_connector.[hc]
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_CONNECTOR_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_connector.h], [
-		AC_DEFINE(HAVE_DRM_CONNECTOR_H, 1,
-			[drm/drm_connector.h is available])
-	])
-])
+	dnl #
+	dnl # commit v4.7-rc5-1465-g34a67dd7f33f
+	dnl # drm: Extract&Document drm_irq.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_irq.h])
 
-dnl #
-dnl # commit v4.8-rc2-384-g321a95ae35f2
-dnl # drm: Extract drm_encoder.[hc]
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_ENCODER_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_encoder.h], [
-		AC_DEFINE(HAVE_DRM_ENCODER_H, 1,
-			[drm/drm_encoder.h is available])
-	])
-])
+	dnl #
+	dnl # commit v4.8-rc2-342-g522171951761
+	dnl # drm: Extract drm_connector.[hc]
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_connector.h])
 
-dnl #
-dnl # v4.8-rc2-798-g43968d7b806d
-dnl # drm: Extract drm_plane.[hc]
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_PLANE_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_plane.h], [
-		AC_DEFINE(HAVE_DRM_PLANE_H, 1, [drm/drm_plane.h is available])
-	])
-])
+	dnl #
+	dnl # commit v4.8-rc2-384-g321a95ae35f2
+	dnl # drm: Extract drm_encoder.[hc]
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_encoder.h])
 
-dnl #
-dnl # commit 1e53724100df15bb83e614879fedbc4914e9f3a1
-dnl # Subject: drm/amdgpu: Redo XGMI reset synchronization.
-dnl #
-AC_DEFUN([AC_AMDGPU_TASK_BARRIER_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/task_barrier.h], [
-		AC_DEFINE(HAVE_TASK_BARRIER_H, 1,
-			[include/drm/task_barrier.h is available])
-	])
-])
+	dnl #
+	dnl # v4.8-rc2-798-g43968d7b806d
+	dnl # drm: Extract drm_plane.[hc]
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_plane.h])
 
-dnl #
-dnl # commit a8f8b1d9b8701465f1309d551fba2ebda6760f49
-dnl # drm: Extract drm_file.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_FILE_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_file.h],[
-		AC_DEFINE(HAVE_DRM_FILE_H, 1, [drm/drm_file.h is available])
-	])
-])
+	dnl #
+	dnl # commit 1e53724100df15bb83e614879fedbc4914e9f3a1
+	dnl # Subject: drm/amdgpu: Redo XGMI reset synchronization.
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/task_barrier.h])
 
-dnl #
-dnl # commit f3804203306e098dae9ca51540fcd5eb700d7f40
-dnl # array_index_nospec: Sanitize speculative array de-references
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_AUTH_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_auth.h], [
-		AC_DEFINE(HAVE_DRM_AUTH_H, 1, [drm/drm_auth.h is available])
-	])
-])
+	dnl #
+	dnl # commit a8f8b1d9b8701465f1309d551fba2ebda6760f49
+	dnl # drm: Extract drm_file.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_file.h])
 
-dnl #
-dnl # commit d8187177b0b195368699ba12b5fa8cd5fdc39b79
-dnl # drm: add helper for printing to log or seq_file
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_PRINT_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_print.h], [
-		AC_DEFINE(HAVE_DRM_PRINT_H, 1, [drm/drm_print.h is available])
-	])
-])
+	dnl #
+	dnl # commit f3804203306e098dae9ca51540fcd5eb700d7f40
+	dnl # array_index_nospec: Sanitize speculative array de-references
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_auth.h])
 
-dnl #
-dnl # commit 72fdb40c1a4b48f5fa6f6083ea7419b94639ed57
-dnl # drm: extract drm_atomic_uapi.c
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_ATOMIC_UAPI_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_atomic_uapi.h], [
-		AC_DEFINE(HAVE_DRM_ATOMIC_UAPI_HEADER, 1,
-			[drm/drm_atomic_uapi.h is available])
-	])
-])
+	dnl #
+	dnl # commit d8187177b0b195368699ba12b5fa8cd5fdc39b79
+	dnl # drm: add helper for printing to log or seq_file
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_print.h])
 
-dnl #
-dnl # commit d78aa650670d2257099469c344d4d147a43652d9
-dnl # drm: Add drm/drm_util.h header file
-dnl #
-dnl # commit e9eafcb589213395232084a2378e2e90f67feb29
-dnl # drm: move drm_can_sleep() to drm_util.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_UTIL_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_util.h],[
-		AC_DEFINE(HAVE_DRM_UTIL_H, 1, [drm/drm_util.h is available])
-	])
-])
+	dnl #
+	dnl # commit 72fdb40c1a4b48f5fa6f6083ea7419b94639ed57
+	dnl # drm: extract drm_atomic_uapi.c
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_atomic_uapi.h])
 
-dnl #
-dnl # commit v5.0-rc1-342-gfcd70cd36b9b
-dnl # drm: Split out drm_probe_helper.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_PROBE_HELPER_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_probe_helper.h], [
-		AC_DEFINE(HAVE_DRM_PROBE_HELPER_H, 1,
-			[drm/drm_probe_helper.h is available])
-	])
-])
+	dnl #
+	dnl # commit d78aa650670d2257099469c344d4d147a43652d9
+	dnl # drm: Add drm/drm_util.h header file
+	dnl #
+	dnl # commit e9eafcb589213395232084a2378e2e90f67feb29
+	dnl # drm: move drm_can_sleep() to drm_util.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_util.h])
 
-dnl #
-dnl # commit e4672e55d6f3428ae9f27542e05c891f2af71051
-dnl # drm: Extract drm_device.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_DEVICE_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_device.h],[
-		AC_DEFINE(HAVE_DRM_DEVICE_H, 1, [drm/drm_device.h is available])
-	])
-])
+	dnl #
+	dnl # commit v5.0-rc1-342-gfcd70cd36b9b
+	dnl # drm: Split out drm_probe_helper.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_probe_helper.h])
 
-dnl #
-dnl # commit v4.12-rc1-158-g3ed4351a83ca
-dnl # drm: Extract drm_vblank.[hc]
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_VBLANK_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_vblank.h], [
-		AC_DEFINE(HAVE_DRM_VBLANK_H, 1, [drm/drm_vblank.h is available])
-	])
-])
-
-dnl #
-dnl # commit v4.11-rc3-927-g7cfdf711ffb0
-dnl # drm: Extract drm_ioctl.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_IOCTL_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_ioctl.h], [
-		AC_DEFINE(HAVE_DRM_IOCTL_H, 1, [drm/drm_ioctl.h is available])
-	])
-])
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_drv.h])
 
-dnl #
-dnl # commit v4.11-rc3-918-g4834442d70be
-dnl # drm: Extract drm_debugfs.h
-dnl #
-AC_DEFUN([AC_AMDGPU_DRM_DEBUGFS_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([drm/drm_debugfs.h], [
-		AC_DEFINE(HAVE_DRM_DEBUGFS_H, 1,
-			[drm/drm_debugfs.h is available])
-	])
-])
+	dnl #
+	dnl # commit e4672e55d6f3428ae9f27542e05c891f2af71051
+	dnl # drm: Extract drm_device.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_device.h])
 
-AC_DEFUN([AC_AMDGPU_DRM_HEADERS], [
-	AC_AMDGPU_DRM_IRQ_H
-	AC_AMDGPU_DRM_CONNECTOR_H
-	AC_AMDGPU_DRM_ENCODER_H
-	AC_AMDGPU_DRM_PLANE_H
-	AC_AMDGPU_TASK_BARRIER_H
-	AC_AMDGPU_DRM_FILE_H
-	AC_AMDGPU_DRM_AUTH_H
-	AC_AMDGPU_DRM_PRINT_H
-	AC_AMDGPU_DRM_ATOMIC_UAPI_H
-	AC_AMDGPU_DRM_UTIL_H
-	AC_AMDGPU_DRM_PROBE_HELPER_H
-	AC_KERNEL_CHECK_HEADERS([drm/drm_drv.h])
-	AC_AMDGPU_DRM_DEVICE_H
+	dnl #
 	AC_KERNEL_CHECK_HEADERS([drm/drmP.h])
-	AC_AMDGPU_DRM_VBLANK_H
-	AC_AMDGPU_DRM_IOCTL_H
-	AC_AMDGPU_DRM_DEBUGFS_H
+
+	dnl #
+	dnl # commit v4.12-rc1-158-g3ed4351a83ca
+	dnl # drm: Extract drm_vblank.[hc]
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_vblank.h])
+
+	dnl #
+	dnl # commit v4.11-rc3-927-g7cfdf711ffb0
+	dnl # drm: Extract drm_ioctl.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_ioctl.h])
+
+	dnl #
+	dnl # Optional devices ID for amdgpu driver
+	dnl #
 	AC_KERNEL_CHECK_HEADERS([drm/amdgpu_pciid.h])
-	dnl # for rhel 7.x
+
+	dnl #
+	dnl # commit v4.11-rc3-918-g4834442d70be
+	dnl # drm: Extract drm_debugfs.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([drm/drm_debugfs.h])
+
+	dnl #
+	dnl # RHEL 7.x wrapper
+	dnl #
 	AC_KERNEL_CHECK_HEADERS([drm/drm_backport.h])
 ])
diff --git a/drivers/gpu/drm/amd/dkms/m4/linux-headers.m4 b/drivers/gpu/drm/amd/dkms/m4/linux-headers.m4
index 6af9dde8a741..6f6f514a13f4 100644
--- a/drivers/gpu/drm/amd/dkms/m4/linux-headers.m4
+++ b/drivers/gpu/drm/amd/dkms/m4/linux-headers.m4
@@ -1,162 +1,68 @@
-dnl #
-dnl # Check whether linux/overflow.h is available
-dnl #
-dnl #
-AC_DEFUN([AC_AMDGPU_OVERFLOW_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/overflow.h], [
-		AC_DEFINE(HAVE_OVERFLOW_H, 1, [linux/overflow.h is available])
-	])
-])
+AC_DEFUN([AC_AMDGPU_LINUX_HEADERS], [
 
-dnl #
-dnl # Check whether linux/sched/mm.h is available
-dnl #
-dnl #
-AC_DEFUN([AC_AMDGPU_SCHED_MM_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/sched/mm.h], [
-		AC_DEFINE(HAVE_MM_H, 1, [linux/sched/mm.h is available])
-	])
-])
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/overflow.h])
 
-dnl #
-dnl # Check whether linux/sched/task.h is available
-dnl #
-dnl #
-AC_DEFUN([AC_AMDGPU_SCHED_TASK_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/sched/task.h], [
-		AC_DEFINE(HAVE_TASK_H, 1, [linux/sched/task.h is available])
-	])
-])
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/sched/mm.h])
 
-dnl #
-dnl # Check whether linux/sched/signal.h is available
-dnl #
-dnl #
-AC_DEFUN([AC_AMDGPU_SCHED_SIGNAL_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/sched/signal.h], [
-		AC_DEFINE(HAVE_SIGNAL_H, 1, [linux/sched/signal.h is available])
-	])
-])
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/sched/task.h])
 
-dnl #
-dnl #  commit v4.15-28-gf3804203306e
-dnl #  array_index_nospec: Sanitize speculative array de-references
-dnl #
-AC_DEFUN([AC_AMDGPU_NOSPEC_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/nospec.h], [
-		AC_DEFINE(HAVE_LINUX_NOSPEC_H, 1, [linux/nospec.h is available])
-	])
-])
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/sched/signal.h])
 
-dnl #
-dnl # commit 4201d9a8e86b51dd40aa8a0dabd093376c859985
-dnl #    kfifo: add the new generic kfifo API
-dnl #
-AC_DEFUN([AC_AMDGPU_KFIFO_NEW_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/kfifo-new.h], [
-		AC_DEFINE(HAVE_KFIFO_NEW_H, 1, [kfifo_new.h is available])
-	])
-])
+	dnl #
+	dnl #  commit v4.15-28-gf3804203306e
+	dnl #  array_index_nospec: Sanitize speculative array de-references
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/nospec.h])
 
-dnl #
-dnl #	commit 8bd9cb51daac89337295b6f037b0486911e1b408
-dnl # locking/atomics, asm-generic: Move some macros from <linux/bitops.h> to a new <linux/bits.h> file
-dnl #
-AC_DEFUN([AC_AMDGPU_BITS_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/bits.h], [
-		AC_DEFINE(HAVE_LINUX_BITS_H, 1,
-			[whether linux/bits.h is available])
-	])
-])
+	dnl #
+	dnl # commit 4201d9a8e86b51dd40aa8a0dabd093376c859985
+	dnl # kfifo: add the new generic kfifo API
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/kfifo-new.h])
 
-dnl #
-dnl # commit v4.3-rc4-1-g2f8e2c877784
-dnl # move io-64-nonatomic*.h out of asm-generic
-dnl #
-AC_DEFUN([AC_AMDGPU_IO_64_NONATOMIC_LO_HI_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/io-64-nonatomic-lo-hi.h], [
-		AC_DEFINE(HAVE_LINUX_IO_64_NONATOMIC_LO_HI_H, 1,
-			[linux/io-64-nonatomic-lo-hi.h is available])
-	])
-])
+	dnl #
+	dnl # commit 8bd9cb51daac89337295b6f037b0486911e1b408
+	dnl # locking/atomics, asm-generic: Move some macros from <linux/bitops.h>
+	dnl # to a new <linux/bits.h> file
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/bits.h])
 
-dnl #
-dnl # commit 299878bac326c890699c696ebba26f56fe93fc75
-dnl # treewide: move set_memory_* functions away from cacheflush.h
-dnl #
-AC_DEFUN([AC_AMDGPU_ASM_SET_MEMORY_H], [
-	AC_KERNEL_TMP_BUILD_DIR([
-		AC_KERNEL_TRY_COMPILE([
-			#include <linux/kernel.h>
-			#ifdef CONFIG_X86
-			#include <asm/set_memory.h>
-			#endif
-		],[
-			#ifndef CONFIG_X86
-			#error just check arch/x86/include/asm/set_memory.h
-			#endif
-		],[
-			AC_DEFINE(HAVE_SET_MEMORY_H, 1, [asm/set_memory.h is available])
-		])
-	])
-])
+	dnl #
+	dnl # commit v4.3-rc4-1-g2f8e2c877784
+	dnl # move io-64-nonatomic*.h out of asm-generic
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([linux/io-64-nonatomic-lo-hi.h])
 
-dnl #
-dnl # commit df6b35f409af0a8ff1ef62f552b8402f3fef8665
-dnl # x86/fpu: Rename i387.h to fpu/api.h
-dnl #
-AC_DEFUN([AC_AMDGPU_ASM_FPU_API_H], [
-	AC_KERNEL_TMP_BUILD_DIR([
-		AC_KERNEL_TRY_COMPILE([
-			#include <linux/kernel.h>
-			#ifdef CONFIG_X86
-			#include <asm/fpu/api.h>
-			#endif
-		],[
-			#ifndef CONFIG_X86
-			#error just check arch/x86/include/asm/fpu/api.h
-			#endif
-		],[
-			AC_DEFINE(HAVE_ASM_FPU_API_H, 1, [asm/fpu/api.h is available])
-		])
-	])
-])
+	dnl #
+	dnl # commit 299878bac326c890699c696ebba26f56fe93fc75
+	dnl # treewide: move set_memory_* functions away from cacheflush.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([asm/set_memory.h])
 
-dnl #
-dnl # commit 607ca46e97a1b6594b29647d98a32d545c24bdff
-dnl # UAPI: (Scripted) Disintegrate include/linux
-dnl #
-AC_DEFUN([AC_AMDGPU_SCHED_TYPES_H], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([uapi/linux/sched/types.h], [
-		AC_DEFINE(HAVE_SCHED_TYPES_H, 1, [sched/types.h is available])
-	])
-])
+	dnl #
+	dnl # commit df6b35f409af0a8ff1ef62f552b8402f3fef8665
+	dnl # x86/fpu: Rename i387.h to fpu/api.h
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([asm/fpu/api.h])
 
-dnl # commit 9826a516ff77c5820e591211e4f3e58ff36f46be
-dnl # Author: Michel Lespinasse <walken@google.com>
-dnl # Date: Mon Oct 8 16:31:35 2012 -0700
-dnl # mm: interval tree updates
-dnl # Update the generic interval tree code that was introduced in
-dnl # "mm:replace  vma prio_tree with an interval tree".
-AC_DEFUN([AC_AMDGPU_MM_INTERVAL_TREE_DEFINE], [
-	AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/interval_tree_generic.h],[
-		AC_DEFINE(HAVE_INTERVAL_TREE_DEFINE, 1,
-			[whether INTERVAL_TREE_DEFINE() is defined])
-	])
-])
+	dnl #
+	dnl # commit 607ca46e97a1b6594b29647d98a32d545c24bdff
+	dnl # UAPI: (Scripted) Disintegrate include/linux
+	dnl #
+	AC_KERNEL_CHECK_HEADERS([uapi/linux/sched/types.h])
 
-AC_DEFUN([AC_AMDGPU_LINUX_HEADERS], [
-	AC_AMDGPU_OVERFLOW_H
-	AC_AMDGPU_SCHED_MM_H
-	AC_AMDGPU_SCHED_TASK_H
-	AC_AMDGPU_SCHED_SIGNAL_H
-	AC_AMDGPU_NOSPEC_H
-	AC_AMDGPU_KFIFO_NEW_H
-	AC_AMDGPU_BITS_H
-	AC_AMDGPU_IO_64_NONATOMIC_LO_HI_H
-	AC_AMDGPU_ASM_SET_MEMORY_H
-	AC_AMDGPU_ASM_FPU_API_H
-	AC_AMDGPU_SCHED_TYPES_H
-	AC_AMDGPU_MM_INTERVAL_TREE_DEFINE
+	dnl # commit 9826a516ff77c5820e591211e4f3e58ff36f46be
+	dnl # Author: Michel Lespinasse <walken@google.com>
+	dnl # Date: Mon Oct 8 16:31:35 2012 -0700
+	dnl # mm: interval tree updates
+	dnl # Update the generic interval tree code that was introduced in
+	dnl # "mm:replace  vma prio_tree with an interval tree".
+	AC_KERNEL_CHECK_HEADERS([linux/interval_tree_generic.h])
+
+	dnl #
 	AC_KERNEL_CHECK_HEADERS([linux/dma-fence.h])
 ])
diff --git a/include/kcl/header/kcl_drm_atomic_uapi_h.h b/include/kcl/header/kcl_drm_atomic_uapi_h.h
index af0e237b1d68..f91a5096cc95 100644
--- a/include/kcl/header/kcl_drm_atomic_uapi_h.h
+++ b/include/kcl/header/kcl_drm_atomic_uapi_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_ATOMIC_UAPI_H_H
 #define AMDKCL_DRM_ATOMIC_UAPI_H_H
 
-#if defined(HAVE_DRM_ATOMIC_UAPI_HEADER)
+#if defined(HAVE_DRM_DRM_ATOMIC_UAPI_H)
 #include <drm/drm_atomic_uapi.h>
 #else
 #include <drm/drm_atomic.h>
diff --git a/include/kcl/header/kcl_drm_auth_h.h b/include/kcl/header/kcl_drm_auth_h.h
index c0a7a6027fe2..94d9e281112a 100644
--- a/include/kcl/header/kcl_drm_auth_h.h
+++ b/include/kcl/header/kcl_drm_auth_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_AUTH_H_H
 #define AMDKCL_DRM_AUTH_H_H
 
-#ifdef HAVE_DRM_AUTH_H
+#ifdef HAVE_DRM_DRM_AUTH_H
 #include <drm/drm_auth.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_connector_h.h b/include/kcl/header/kcl_drm_connector_h.h
index 1aceb6d09bfa..5f1e8a422282 100644
--- a/include/kcl/header/kcl_drm_connector_h.h
+++ b/include/kcl/header/kcl_drm_connector_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_CONNECTOR_H_H
 #define AMDKCL_DRM_CONNECTOR_H_H
 
-#ifdef HAVE_DRM_CONNECTOR_H
+#ifdef HAVE_DRM_DRM_CONNECTOR_H
 #include <drm/drm_connector.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_debugfs_h.h b/include/kcl/header/kcl_drm_debugfs_h.h
index 4ebf16c201c6..0c3552b581dc 100644
--- a/include/kcl/header/kcl_drm_debugfs_h.h
+++ b/include/kcl/header/kcl_drm_debugfs_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_DEBUGFS_H_H
 #define AMDKCL_DRM_DEBUGFS_H_H
 
-#ifdef HAVE_DRM_DEBUGFS_H
+#ifdef HAVE_DRM_DRM_DEBUGFS_H
 #include <drm/drm_debugfs.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_device_h.h b/include/kcl/header/kcl_drm_device_h.h
index 1e22b958280e..50d048464f94 100644
--- a/include/kcl/header/kcl_drm_device_h.h
+++ b/include/kcl/header/kcl_drm_device_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_DEVICE_H_H
 #define AMDKCL_DRM_DEVICE_H_H
 
-#ifdef HAVE_DRM_DEVICE_H
+#ifdef HAVE_DRM_DRM_DEVICE_H
 #include <drm/drm_device.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_encoder_h.h b/include/kcl/header/kcl_drm_encoder_h.h
index 7004bf1f6526..013f10fbd6d6 100644
--- a/include/kcl/header/kcl_drm_encoder_h.h
+++ b/include/kcl/header/kcl_drm_encoder_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_ENCODER_H_H
 #define AMDKCL_DRM_ENCODER_H_H
 
-#ifdef HAVE_DRM_ENCODER_H
+#ifdef HAVE_DRM_DRM_ENCODER_H
 #include <drm/drm_encoder.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_file_h.h b/include/kcl/header/kcl_drm_file_h.h
index dc957ba8e718..48c4e2fdf4a2 100644
--- a/include/kcl/header/kcl_drm_file_h.h
+++ b/include/kcl/header/kcl_drm_file_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_FILE_H_H
 #define AMDKCL_DRM_FILE_H_H
 
-#ifdef HAVE_DRM_FILE_H
+#ifdef HAVE_DMR_DRM_FILE_H
 #include <drm/drm_file.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_ioctl_h.h b/include/kcl/header/kcl_drm_ioctl_h.h
index 9a132bbab6a3..1b567de29bd8 100644
--- a/include/kcl/header/kcl_drm_ioctl_h.h
+++ b/include/kcl/header/kcl_drm_ioctl_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_IOCTL_H_H
 #define AMDKCL_DRM_IOCTL_H_H
 
-#ifdef HAVE_DRM_IOCTL_H
+#ifdef HAVE_DRM_DRM_IOCTL_H
 #include <drm/drm_ioctl.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_irq_h.h b/include/kcl/header/kcl_drm_irq_h.h
index 12520109fe7a..c147ea314d83 100644
--- a/include/kcl/header/kcl_drm_irq_h.h
+++ b/include/kcl/header/kcl_drm_irq_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_IRQ_H_H
 #define AMDKCL_DRM_IRQ_H_H
 
-#ifdef HAVE_DRM_IRQ_H
+#ifdef HAVE_DRM_DRM_IRQ_H
 #include <drm/drm_irq.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_plane_h.h b/include/kcl/header/kcl_drm_plane_h.h
index ee057ecdec87..5cdea2c7411d 100644
--- a/include/kcl/header/kcl_drm_plane_h.h
+++ b/include/kcl/header/kcl_drm_plane_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PLANE_H_H
 #define AMDKCL_DRM_PLANE_H_H
 
-#ifdef HAVE_DRM_PLANE_H
+#ifdef HAVE_DRM_DRM_PLANE_H
 #include <drm/drm_plane.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_print_h.h b/include/kcl/header/kcl_drm_print_h.h
index dbf7230d784b..e622850d7665 100644
--- a/include/kcl/header/kcl_drm_print_h.h
+++ b/include/kcl/header/kcl_drm_print_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PRINT_H_H
 #define AMDKCL_DRM_PRINT_H_H
 
-#if defined(HAVE_DRM_PRINT_H)
+#if defined(HAVE_DRM_DRM_PRINT_H)
 #include <drm/drm_print.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_drm_probe_helper_h.h b/include/kcl/header/kcl_drm_probe_helper_h.h
index 3af82291f092..b3fe643ce8c3 100644
--- a/include/kcl/header/kcl_drm_probe_helper_h.h
+++ b/include/kcl/header/kcl_drm_probe_helper_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PROBE_HELPER_H_H
 #define AMDKCL_DRM_PROBE_HELPER_H_H
 
-#ifdef HAVE_DRM_PROBE_HELPER_H
+#ifdef HAVE_DRM_DRM_PROBE_HELPER_H
 #include <drm/drm_probe_helper.h>
 #else
 #include <drm/drm_crtc_helper.h>
diff --git a/include/kcl/header/kcl_drm_util_h.h b/include/kcl/header/kcl_drm_util_h.h
index 1b15a9eb8ed1..22998a717944 100644
--- a/include/kcl/header/kcl_drm_util_h.h
+++ b/include/kcl/header/kcl_drm_util_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_UTIL_H_H
 #define AMDKCL_DRM_UTIL_H_H
 
-#ifdef HAVE_DRM_UTIL_H
+#ifdef HAVE_DRM_DRM_UTIL_H
 #include <drm/drm_util.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_vblank_h.h b/include/kcl/header/kcl_drm_vblank_h.h
index 3e590b51f50b..08fdd4982bd4 100644
--- a/include/kcl/header/kcl_drm_vblank_h.h
+++ b/include/kcl/header/kcl_drm_vblank_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_VBLANK_H_H
 #define AMDKCL_DRM_VBLANK_H_H
 
-#ifdef HAVE_DRM_VBLANK_H
+#ifdef HAVE_DRM_DRM_VBLANK_H
 #include <drm/drm_vblank.h>
 #else
 #include <kcl/header/kcl_drm_irq_h.h>
diff --git a/include/kcl/header/kcl_kfifo_h.h b/include/kcl/header/kcl_kfifo_h.h
index 26992729bc2f..8a35d6989d9d 100644
--- a/include/kcl/header/kcl_kfifo_h.h
+++ b/include/kcl/header/kcl_kfifo_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_KFIFO_H_H
 #define AMDKCL_KFIFO_H_H
 
-#if defined(HAVE_KFIFO_NEW_H)
+#if defined(HAVE_LINUX_KFIFO_NEW_H)
 #include <linux/kfifo-new.h>
 #else
 #include <linux/kfifo.h>
diff --git a/include/kcl/header/kcl_sched_mm_h.h b/include/kcl/header/kcl_sched_mm_h.h
index d0da6d6e0b1f..22788fe65a47 100644
--- a/include/kcl/header/kcl_sched_mm_h.h
+++ b/include/kcl/header/kcl_sched_mm_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_MM_H_H
 #define AMDKCL_SCHED_MM_H_H
 
-#if defined(HAVE_MM_H)
+#if defined(HAVE_LINUX_SCHED_MM_H)
 #include <linux/sched/mm.h>
 #else
 #include <linux/sched.h>
diff --git a/include/kcl/header/kcl_sched_signal_h.h b/include/kcl/header/kcl_sched_signal_h.h
index 22e8a38a58ff..b3d74124fb15 100644
--- a/include/kcl/header/kcl_sched_signal_h.h
+++ b/include/kcl/header/kcl_sched_signal_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_SIGNAL_H_H
 #define AMDKCL_SCHED_SIGNAL_H_H
 
-#if defined(HAVE_SIGNAL_H)
+#if defined(HAVE_LINUX_SCHED_SIGNAL_H)
 #include <linux/sched/signal.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_sched_task_h.h b/include/kcl/header/kcl_sched_task_h.h
index 175b28c8e4e6..9e74ca933f79 100644
--- a/include/kcl/header/kcl_sched_task_h.h
+++ b/include/kcl/header/kcl_sched_task_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_TASK_H_H
 #define AMDKCL_SCHED_TASK_H_H
 
-#if defined(HAVE_TASK_H)
+#if defined(HAVE_LINUX_SCHED_TASK_H)
 #include <linux/sched/task.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_set_memory_h.h b/include/kcl/header/kcl_set_memory_h.h
index 1818bd2c1d3b..980773770d2e 100644
--- a/include/kcl/header/kcl_set_memory_h.h
+++ b/include/kcl/header/kcl_set_memory_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SET_MEMORY_H_H
 #define AMDKCL_SET_MEMORY_H_H
 
-#if defined(HAVE_SET_MEMORY_H)
+#if defined(HAVE_ASM_SET_MEMORY_H)
 #include <asm/set_memory.h>
 #else
 #include <asm/cacheflush.h>
diff --git a/include/kcl/header/kcl_uapi_linux_sched_types_h.h b/include/kcl/header/kcl_uapi_linux_sched_types_h.h
index 632b09589192..dfd703f14557 100644
--- a/include/kcl/header/kcl_uapi_linux_sched_types_h.h
+++ b/include/kcl/header/kcl_uapi_linux_sched_types_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_UAPI_LINUX_SCHED_TYPES_H_H
 #define AMDKCL_UAPI_LINUX_SCHED_TYPES_H_H
 
-#ifdef HAVE_SCHED_TYPES_H
+#ifdef HAVE_UAPI_LINUX_SCHED_TYPES_H
 #include <uapi/linux/sched/types.h>
 #endif
 #endif
diff --git a/include/kcl/kcl_drm.h b/include/kcl/kcl_drm.h
index af2eb7841fcd..ce5246b424ee 100644
--- a/include/kcl/kcl_drm.h
+++ b/include/kcl/kcl_drm.h
@@ -223,7 +223,7 @@ bool drm_is_current_master(struct drm_file *fpriv);
 u64 drm_get_max_iomem(void);
 #endif
 
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 struct drm_printer {
 	void (*printfn)(struct drm_printer *p, struct va_format *vaf);
 	void *arg;
@@ -283,7 +283,7 @@ static inline struct drm_printer drm_debug_printer(const char *prefix)
 {
 	struct drm_printer p = {
 		.printfn = __drm_printfn_debug,
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 		.prefix = prefix
 #endif
 	};
diff --git a/include/kcl/kcl_interval_tree_generic.h b/include/kcl/kcl_interval_tree_generic.h
index 0248e60bc3a6..96890fcbe297 100644
--- a/include/kcl/kcl_interval_tree_generic.h
+++ b/include/kcl/kcl_interval_tree_generic.h
@@ -21,7 +21,7 @@
 */
 
 #include <linux/rbtree.h>
-#if defined(HAVE_INTERVAL_TREE_DEFINE)
+#if defined(HAVE_LINUX_INTERVAL_TREE_GENERIC_H)
 #include <linux/interval_tree_generic.h>
 #else
 
diff --git a/include/kcl/kcl_overflow.h b/include/kcl/kcl_overflow.h
index 273544766d1b..4195bb5fce1c 100644
--- a/include/kcl/kcl_overflow.h
+++ b/include/kcl/kcl_overflow.h
@@ -3,7 +3,7 @@
 #ifndef AMDKCL_OVERFLOW_H
 #define AMDKCL_OVERFLOW_H
 
-#ifdef HAVE_OVERFLOW_H
+#ifdef HAVE_LINUX_OVERFLOW_H
 #include <linux/overflow.h>
 #endif
 
diff --git a/include/kcl/kcl_task_barrier.h b/include/kcl/kcl_task_barrier.h
index 5107dfbe55c3..341fe8e02a9d 100644
--- a/include/kcl/kcl_task_barrier.h
+++ b/include/kcl/kcl_task_barrier.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_TASK_BARRIER_H
 #define AMDKCL_DRM_TASK_BARRIER_H
 
-#ifdef HAVE_TASK_BARRIER_H
+#ifdef HAVE_DRM_TASK_BARRIER_H
 #include <drm/task_barrier.h>
 #else
 /*