diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2638-drm-amdgpu-display-provide-ASSERT-macros-uncondition.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2638-drm-amdgpu-display-provide-ASSERT-macros-uncondition.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2638-drm-amdgpu-display-provide-ASSERT-macros-uncondition.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2638-drm-amdgpu-display-provide-ASSERT-macros-uncondition.patch new file mode 100644 index 00000000..9228b961 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2638-drm-amdgpu-display-provide-ASSERT-macros-uncondition.patch @@ -0,0 +1,47 @@ +From 5c5402cddeec3704313102bf4d450ad49f873728 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Thu, 2 Nov 2017 15:24:40 +0100 +Subject: [PATCH 2638/4131] drm/amdgpu/display: provide ASSERT macros + unconditionally + +It seems impossible to build this driver without setting either +CONFIG_DEBUG_KERNEL or CONFIG_DEBUG_DRIVER: + +drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex': +drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration] + +This moves the ASSERT() macro and related helpers outside of +the #ifdef to get it to build again. + +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/os_types.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h +index 86170b4..a87c032 100644 +--- a/drivers/gpu/drm/amd/display/dc/os_types.h ++++ b/drivers/gpu/drm/amd/display/dc/os_types.h +@@ -61,8 +61,6 @@ + * general debug capabilities + * + */ +-#if defined(CONFIG_DEBUG_KERNEL) || defined(CONFIG_DEBUG_DRIVER) +- + #if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB) + #define ASSERT_CRITICAL(expr) do { \ + if (WARN_ON(!(expr))) { \ +@@ -86,8 +84,6 @@ + + #define BREAK_TO_DEBUGGER() ASSERT(0) + +-#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ +- + #define DC_ERR(...) do { \ + dm_error(__VA_ARGS__); \ + BREAK_TO_DEBUGGER(); \ +-- +2.7.4 + |