public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm: avoid switching to text console if there is no panic timeout
@ 2011-10-18  0:06 Mandeep Singh Baines
  2011-10-18  0:27 ` David Rientjes
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Mandeep Singh Baines @ 2011-10-18  0:06 UTC (permalink / raw)
  To: linux-kernel, David Airlie
  Cc: Hugh Dickins, Hugh Dickins, Mandeep Singh Baines, Dave Airlie,
	Andrew Morton, dri-devel

From: Hugh Dickins <hughd@chromium.org>

Add a check for panic_timeout in the drm_fb_helper_panic() notifier: if
we're going to reboot immediately, the user will not be able to see the
messages anyway, and messing with the video mode may display artifacts,
and certainly get into several layers of complexity (including mutexes and
memory allocations) which we shall be much safer to avoid.

Signed-off-by: Hugh Dickins <hughd@google.com>
[ Edited commit message and modified to short-circuit panic_timeout < 0
  instead of testing panic_timeout >= 0.  -Mandeep ]
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/drm_fb_helper.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index f7c6854..0e62c93 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -254,6 +254,13 @@ bool drm_fb_helper_force_kernel_mode(void)
 int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,
 			void *panic_str)
 {
+	/*
+	 * It's a waste of time and effort to switch back to text console
+	 * if the kernel should reboot before panic messages can be seen.
+	 */
+	if (panic_timeout < 0)
+		return 0;
+
 	printk(KERN_ERR "panic occurred, switching back to text console\n");
 	return drm_fb_helper_force_kernel_mode();
 }
-- 
1.7.3.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-11-10 21:51 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-18  0:06 [PATCH] drm: avoid switching to text console if there is no panic timeout Mandeep Singh Baines
2011-10-18  0:27 ` David Rientjes
2011-11-10 20:50   ` David Rientjes
2011-11-10 21:15     ` Mandeep Singh Baines
2011-11-10 21:29       ` Dave Airlie
2011-11-10 21:51       ` Andrew Morton
2011-10-18  1:33 ` Stéphane Marchesin
2011-10-18  2:19 ` Dave Young
2011-10-18  2:22   ` Dave Young
2011-10-18 18:29     ` Mandeep Singh Baines
2011-10-19  1:07       ` Dave Young

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox