Jelajahi Sumber

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>
Arnd Bergmann 7 tahun lalu
induk
melakukan
d8eed8263a
1 mengubah file dengan 0 tambahan dan 4 penghapusan
  1. 0 4
      drivers/gpu/drm/amd/display/dc/os_types.h

+ 0 - 4
drivers/gpu/drm/amd/display/dc/os_types.h

@@ -61,8 +61,6 @@
  * general debug capabilities
  * general debug capabilities
  *
  *
  */
  */
-#if defined(CONFIG_DEBUG_KERNEL) || defined(CONFIG_DEBUG_DRIVER)
-
 #if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB)
 #if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB)
 #define ASSERT_CRITICAL(expr) do {	\
 #define ASSERT_CRITICAL(expr) do {	\
 	if (WARN_ON(!(expr))) { \
 	if (WARN_ON(!(expr))) { \
@@ -86,8 +84,6 @@
 
 
 #define BREAK_TO_DEBUGGER() ASSERT(0)
 #define BREAK_TO_DEBUGGER() ASSERT(0)
 
 
-#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */
-
 #define DC_ERR(...)  do { \
 #define DC_ERR(...)  do { \
 	dm_error(__VA_ARGS__); \
 	dm_error(__VA_ARGS__); \
 	BREAK_TO_DEBUGGER(); \
 	BREAK_TO_DEBUGGER(); \