The patch titled
pm3fb: switching between X and fb fix
has been added to the -mm tree. Its filename is
pm3fb-switching-between-x-and-fb-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pm3fb: switching between X and fb fix
From: Krzysztof Helt <krzysztof.h1@xxxxx>
This patch correctly restores console state after switching from X.
Otherwise, screen is always off after switching from X.
Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/pm3fb.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/video/pm3fb.c~pm3fb-switching-between-x-and-fb-fix drivers/video/pm3fb.c
--- a/drivers/video/pm3fb.c~pm3fb-switching-between-x-and-fb-fix
+++ a/drivers/video/pm3fb.c
@@ -498,7 +498,7 @@ static int pm3fb_set_par(struct fb_info
else
par->video |= PM3VideoControl_LINE_DOUBLE_OFF;
- if (info->var.activate == FB_ACTIVATE_NOW)
+ if ((info->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
par->video |= PM3VideoControl_ENABLE;
else {
par->video |= PM3VideoControl_DISABLE;
_
Patches currently in -mm which might be from krzysztof.h1@xxxxx are
origin.patch
skeletonfb-fix-of-xxxfb_setup-ifdef.patch
fbcon-smart-blitter-usage-for-scrolling.patch
pm3fb-switching-between-x-and-fb-fix.patch
pm2fb-white-spaces-clean-up.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
