Commit d68752cf authored by Hugh Dickins's avatar Hugh Dickins Committed by Dave Airlie
Browse files

drm: avoid switching to text console if there is no panic timeout

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: default avatarHugh Dickins <>
[ Edited commit message and modified to short-circuit panic_timeout < 0
  instead of testing panic_timeout >= 0.  -Mandeep ]
Signed-off-by: default avatarMandeep Singh Baines <>
Acked-by: default avatarDavid Rientjes <>
Acked-by: default avatarStéphane Marchesin <>
Signed-off-by: default avatarDave Airlie <>
parent 1ea6b8f4
......@@ -255,6 +255,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();
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment