* [PATCH] fbcon: unconditionally initialize cursor blink interval
@ 2015-08-04 12:33 Scot Doyle
2015-08-04 20:32 ` Pavel Machek
0 siblings, 1 reply; 4+ messages in thread
From: Scot Doyle @ 2015-08-04 12:33 UTC (permalink / raw)
To: Tomi Valkeinen, Jean-Christophe Plagniol-Villard
Cc: Thierry Reding, Kevin Hilman, Greg Kroah-Hartman, Jiri Slaby,
Pavel Machek, Geert Uytterhoeven, linux-fbdev, linux-kernel
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 <net147@gmail.com>
Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fbcon: unconditionally initialize cursor blink interval
2015-08-04 12:33 [PATCH] fbcon: unconditionally initialize cursor blink interval Scot Doyle
@ 2015-08-04 20:32 ` Pavel Machek
2015-08-10 14:05 ` Scot Doyle
0 siblings, 1 reply; 4+ messages in thread
From: Pavel Machek @ 2015-08-04 20:32 UTC (permalink / raw)
To: Scot Doyle
Cc: Tomi Valkeinen, Jean-Christophe Plagniol-Villard, Thierry Reding,
Kevin Hilman, Greg Kroah-Hartman, Jiri Slaby, Geert Uytterhoeven,
linux-fbdev, linux-kernel
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 <net147@gmail.com>
> Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fbcon: unconditionally initialize cursor blink interval
2015-08-04 20:32 ` Pavel Machek
@ 2015-08-10 14:05 ` Scot Doyle
2015-08-10 14:21 ` Tomi Valkeinen
0 siblings, 1 reply; 4+ messages in thread
From: Scot Doyle @ 2015-08-10 14:05 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Jean-Christophe Plagniol-Villard, Jonathan Liu, Pavel Machek,
Thierry Reding, Kevin Hilman, Greg Kroah-Hartman, Jiri Slaby,
Geert Uytterhoeven, linux-fbdev, linux-kernel
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 <net147@gmail.com>
> > Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
>
> Acked-by: Pavel Machek <pavel@ucw.cz>
>
Tomi, this one should also go in 4.2 fixes.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fbcon: unconditionally initialize cursor blink interval
2015-08-10 14:05 ` Scot Doyle
@ 2015-08-10 14:21 ` Tomi Valkeinen
0 siblings, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2015-08-10 14:21 UTC (permalink / raw)
To: Scot Doyle
Cc: Jean-Christophe Plagniol-Villard, Jonathan Liu, Pavel Machek,
Thierry Reding, Kevin Hilman, Greg Kroah-Hartman, Jiri Slaby,
Geert Uytterhoeven, linux-fbdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 652 bytes --]
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 <net147@gmail.com>
>>> Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
>>
>> Acked-by: Pavel Machek <pavel@ucw.cz>
>>
>
> Tomi, this one should also go in 4.2 fixes.
Thanks, I've queued for 4.2 fixes.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-10 14:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-04 12:33 [PATCH] fbcon: unconditionally initialize cursor blink interval Scot Doyle
2015-08-04 20:32 ` Pavel Machek
2015-08-10 14:05 ` Scot Doyle
2015-08-10 14:21 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).