2015-08-04 12:33:37

by Scot Doyle

[permalink] [raw]
Subject: [PATCH] fbcon: unconditionally initialize cursor blink interval

A sun7i-a20-olinuxino-micro fails to boot when kernel parameter
vt.global_cursor_default=0. The value is copied to vc->vc_deccm
causing the initialization of ops->cur_blink_jiffies to be skipped.
Unconditionally initialize it.

Reported-and-tested-by: Jonathan Liu <[email protected]>
Signed-off-by: Scot Doyle <[email protected]>
---
drivers/video/console/fbcon.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 658c34b..1aaf893 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1306,10 +1306,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
int y;
int c = scr_readw((u16 *) vc->vc_pos);

+ ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
+
if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
return;

- ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
if (vc->vc_cursor_type & 0x10)
fbcon_del_cursor_timer(info);
else
--
2.1.4


2015-08-04 20:32:54

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] fbcon: unconditionally initialize cursor blink interval

On Tue 2015-08-04 12:33:32, Scot Doyle wrote:
> A sun7i-a20-olinuxino-micro fails to boot when kernel parameter
> vt.global_cursor_default=0. The value is copied to vc->vc_deccm
> causing the initialization of ops->cur_blink_jiffies to be skipped.
> Unconditionally initialize it.
>
> Reported-and-tested-by: Jonathan Liu <[email protected]>
> Signed-off-by: Scot Doyle <[email protected]>

Acked-by: Pavel Machek <[email protected]>

> index 658c34b..1aaf893 100644
> --- a/drivers/video/console/fbcon.c
> +++ b/drivers/video/console/fbcon.c
> @@ -1306,10 +1306,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
> int y;
> int c = scr_readw((u16 *) vc->vc_pos);
>
> + ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
> +
> if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
> return;
>
> - ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
> if (vc->vc_cursor_type & 0x10)
> fbcon_del_cursor_timer(info);
> else

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2015-08-10 14:06:00

by Scot Doyle

[permalink] [raw]
Subject: Re: [PATCH] fbcon: unconditionally initialize cursor blink interval

On Tue, 4 Aug 2015, Pavel Machek wrote:
> On Tue 2015-08-04 12:33:32, Scot Doyle wrote:
> > A sun7i-a20-olinuxino-micro fails to boot when kernel parameter
> > vt.global_cursor_default=0. The value is copied to vc->vc_deccm
> > causing the initialization of ops->cur_blink_jiffies to be skipped.
> > Unconditionally initialize it.
> >
> > Reported-and-tested-by: Jonathan Liu <[email protected]>
> > Signed-off-by: Scot Doyle <[email protected]>
>
> Acked-by: Pavel Machek <[email protected]>
>

Tomi, this one should also go in 4.2 fixes.

2015-08-10 14:22:01

by Tomi Valkeinen

[permalink] [raw]
Subject: Re: [PATCH] fbcon: unconditionally initialize cursor blink interval



On 10/08/15 17:05, Scot Doyle wrote:
> On Tue, 4 Aug 2015, Pavel Machek wrote:
>> On Tue 2015-08-04 12:33:32, Scot Doyle wrote:
>>> A sun7i-a20-olinuxino-micro fails to boot when kernel parameter
>>> vt.global_cursor_default=0. The value is copied to vc->vc_deccm
>>> causing the initialization of ops->cur_blink_jiffies to be skipped.
>>> Unconditionally initialize it.
>>>
>>> Reported-and-tested-by: Jonathan Liu <[email protected]>
>>> Signed-off-by: Scot Doyle <[email protected]>
>>
>> Acked-by: Pavel Machek <[email protected]>
>>
>
> Tomi, this one should also go in 4.2 fixes.

Thanks, I've queued for 4.2 fixes.

Tomi

Attachments:
signature.asc (819.00 B)
OpenPGP digital signature