| From 8b7dc1fe1a5c1093551f6cd7dfbb941bd9081c2e Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Fri, 23 Oct 2020 09:46:55 +0200 |
| Subject: drm/amd/display: Don't invoke kgdb_breakpoint() unconditionally |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit 8b7dc1fe1a5c1093551f6cd7dfbb941bd9081c2e upstream. |
| |
| ASSERT_CRITICAL() invokes kgdb_breakpoint() whenever either |
| CONFIG_KGDB or CONFIG_HAVE_KGDB is set. This, however, may lead to a |
| kernel panic when no kdb stuff is attached, since the |
| kgdb_breakpoint() call issues INT3. It's nothing but a surprise for |
| normal end-users. |
| |
| For avoiding the pitfall, make the kgdb_breakpoint() call only when |
| CONFIG_DEBUG_KERNEL_DC is set. |
| |
| https://bugzilla.opensuse.org/show_bug.cgi?id=1177973 |
| Cc: <stable@vger.kernel.org> |
| Acked-by: Alex Deucher <alexander.deucher@amd.com> |
| Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/amd/display/dc/os_types.h |
| +++ b/drivers/gpu/drm/amd/display/dc/os_types.h |
| @@ -90,7 +90,7 @@ |
| * general debug capabilities |
| * |
| */ |
| -#if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB) |
| +#if defined(CONFIG_DEBUG_KERNEL_DC) && (defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB)) |
| #define ASSERT_CRITICAL(expr) do { \ |
| if (WARN_ON(!(expr))) { \ |
| kgdb_breakpoint(); \ |
