* [PATCH] pxafb: do console locking before calling fb_blank()
@ 2012-02-26 13:52 Vasily Khoruzhick
2012-03-07 10:09 ` Florian Tobias Schandinat
0 siblings, 1 reply; 2+ messages in thread
From: Vasily Khoruzhick @ 2012-02-26 13:52 UTC (permalink / raw)
To: linux-arm-kernel
Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/video/pxafb.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 1d1e4f1..c176561 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -54,6 +54,7 @@
#include <linux/mutex.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
+#include <linux/console.h>
#include <mach/hardware.h>
#include <asm/io.h>
@@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user)
if (user = 0)
return -ENODEV;
- if (ofb->usage++ = 0)
+ if (ofb->usage++ = 0) {
/* unblank the base framebuffer */
+ console_lock();
fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);
+ console_unlock();
+ }
return 0;
}
--
1.7.9.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] pxafb: do console locking before calling fb_blank()
2012-02-26 13:52 [PATCH] pxafb: do console locking before calling fb_blank() Vasily Khoruzhick
@ 2012-03-07 10:09 ` Florian Tobias Schandinat
0 siblings, 0 replies; 2+ messages in thread
From: Florian Tobias Schandinat @ 2012-03-07 10:09 UTC (permalink / raw)
To: linux-arm-kernel
On 02/26/2012 01:52 PM, Vasily Khoruzhick wrote:
> Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Applied.
Thanks,
Florian Tobias Schandinat
> ---
> drivers/video/pxafb.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
> index 1d1e4f1..c176561 100644
> --- a/drivers/video/pxafb.c
> +++ b/drivers/video/pxafb.c
> @@ -54,6 +54,7 @@
> #include <linux/mutex.h>
> #include <linux/kthread.h>
> #include <linux/freezer.h>
> +#include <linux/console.h>
>
> #include <mach/hardware.h>
> #include <asm/io.h>
> @@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user)
> if (user = 0)
> return -ENODEV;
>
> - if (ofb->usage++ = 0)
> + if (ofb->usage++ = 0) {
> /* unblank the base framebuffer */
> + console_lock();
> fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);
> + console_unlock();
> + }
>
> return 0;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-07 10:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-26 13:52 [PATCH] pxafb: do console locking before calling fb_blank() Vasily Khoruzhick
2012-03-07 10:09 ` Florian Tobias Schandinat
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).