From f86c9b8b56a74b2d0d3543339b2ac52b75b2237e Mon Sep 17 00:00:00 2001 From: Nicholas Kazlauskas Date: Wed, 3 Jun 2020 09:32:10 -0400 Subject: [PATCH] drm/amd/display: Only actually breakpoint if DEBUG_KERNEL_DC is enabled To match previous behavior and to not hang the kernel if someone accidentally builds with KGDB enabled. Fixes: 1aad7078191116f ("drm/amd/display: Make BREAK_TO_DEBUGGER() a debug print") Signed-off-by: Nicholas Kazlauskas Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h index 604ceb6c0375..c3bbfe397e8d 100644 --- a/drivers/gpu/drm/amd/display/dc/os_types.h +++ b/drivers/gpu/drm/amd/display/dc/os_types.h @@ -111,7 +111,7 @@ #define ASSERT(expr) WARN_ON_ONCE(!(expr)) #endif -#if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB) +#if defined(CONFIG_DEBUG_KERNEL_DC) && (defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB)) #define BREAK_TO_DEBUGGER() \ do { \ DRM_DEBUG_DRIVER("%s():%d\n", __func__, __LINE__); \ -- 2.25.1