| Message ID | 20171102142501.684516-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | d8eed8263aa09c0c92416d06321eae4ad3eda343 |
| Headers | show |
| Series | [v2] drm/amdgpu/display: provide ASSERT macros unconditionally | expand |
On 2017-11-02 10:24 AM, Arnd Bergmann wrote: > 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. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/dc/os_types.h | 4 ---- > 1 file changed, 4 deletions(-) > > v2: remove accidtental comment change. > > diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h > index 86170b40b5c5..a87c0329541f 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(); \ >
diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h index 86170b40b5c5..a87c0329541f 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(); \
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/amd/display/dc/os_types.h | 4 ---- 1 file changed, 4 deletions(-) v2: remove accidtental comment change. -- 2.9.0