blob: ff76e76b0627e7f8dfa5c6b43c546704e7891e18 [file] [log] [blame]
Joel Stanleyaaafb392015-10-28 15:52:12 +10301From a9f6fe770be903195109d0839f8192052859251d Mon Sep 17 00:00:00 2001
Joel Stanley40866452015-10-20 15:20:29 +10302From: Scot Doyle <lkml14@scotdoyle.com>
3Date: Fri, 9 Oct 2015 15:08:10 +0000
Joel Stanleyeb877af2015-10-25 14:33:50 +10304Subject: [PATCH 16/17] fbcon: initialize blink interval before calling
Joel Stanley40866452015-10-20 15:20:29 +10305 fb_set_par
6
7Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
8 fbcon: use the cursor blink interval provided by vt
9
10a PPC64LE kernel fails to boot when fbcon_add_cursor_timer uses an
11uninitialized ops->cur_blink_jiffies. Prevent by initializing
12in fbcon_init before the call to info->fbops->fb_set_par.
13
14Reported-and-tested-by: Alistair Popple <alistair@popple.id.au>
15Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
16Cc: <stable@vger.kernel.org> [v4.2]
17Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18Signed-off-by: Joel Stanley <joel@jms.id.au>
19---
20 drivers/video/console/fbcon.c | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
24index 1aaf893..92f3949 100644
25--- a/drivers/video/console/fbcon.c
26+++ b/drivers/video/console/fbcon.c
27@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init)
28 con_copy_unimap(vc, svc);
29
30 ops = info->fbcon_par;
31+ ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
32 p->con_rotate = initial_rotation;
33 set_blitting_type(vc, info);
34
35--
362.5.0
37