[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100409151256.7c3cdaaa@virtuousgeek.org>
Date: Fri, 9 Apr 2010 15:12:56 -0700
From: Jesse Barnes <jbarnes@...tuousgeek.org>
To: dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
Linus Torvalds <torvalds@...ux-foundation.org>,
Dave Airlie <airlied@...il.com>,
James Simmons <jsimmons@...radead.org>
Subject: [PATCH] fbcon: assume console is active if panicing
This allows us to draw to the fbcon buffer in a panic situation, in case
the low level driver can flip to it at panic time.
Signed-off-by: Jesse Barnes <jbarnes@...tuousgeek.org>
---
drivers/video/console/fbcon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index b0a3fa0..6ca1051 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -283,7 +283,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
struct fbcon_ops *ops = info->fbcon_par;
return (info->state != FBINFO_STATE_RUNNING ||
- vc->vc_mode != KD_TEXT || ops->graphics);
+ vc->vc_mode != KD_TEXT || ops->graphics) && !oops_in_progress;
}
static inline int get_color(struct vc_data *vc, struct fb_info *info,
--
1.6.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists