gbefb fix colors when depth is set with fbset, fwd from akpm

diff --git a/queue/gbefb-ip32-gbefb-depth-change-fix.patch b/queue/gbefb-ip32-gbefb-depth-change-fix.patch
new file mode 100644 (file)
index 0000000..5905bd8
--- /dev/null
+++ b/queue/gbefb-ip32-gbefb-depth-change-fix.patch
@@ -0,0 +1,43 @@
+From stable-bounces@linux.kernel.org  Fri Feb 24 13:09:18 2006
+Date: Fri, 24 Feb 2006 13:04:15 -0800
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: adaplas@pol.net, milang@tal.org, stable@kernel.org, tbm@cyrius.com
+Subject: [PATCH] gbefb: IP32 gbefb depth change fix
+
+
+From: Kaj-Michael Lang <milang@tal.org>
+
+The gbefb driver does not update the framebuffer layers visual setting when
+depth is changed with fbset, resulting in strange colors (very dark blue in
+16-bit, almost black in 24-bit).
+
+Signed-off-by: Kaj-Michael Lang <milang@tal.org>
+Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
+Signed-off-by: Antonino Daplas <adaplas@pol.net>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/video/gbefb.c |    3 +++
+ 1 files changed, 3 insertions(+)
+
+--- linux-2.6.15.4.orig/drivers/video/gbefb.c
++++ linux-2.6.15.4/drivers/video/gbefb.c
+@@ -656,12 +656,15 @@ static int gbefb_set_par(struct fb_info 
+       switch (bytesPerPixel) {
+       case 1:
+               SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_I8);
++              info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+               break;
+       case 2:
+               SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_ARGB5);
++              info->fix.visual = FB_VISUAL_TRUECOLOR;
+               break;
+       case 4:
+               SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_RGB8);
++              info->fix.visual = FB_VISUAL_TRUECOLOR;
+               break;
+       }
+       SET_GBE_FIELD(WID, BUF, val, GBE_BMODE_BOTH);

diff --git a/queue/series b/queue/series
index 565468a80311e0a103f968323e77f7975c1d273f..23d0a4a1c27540c93462ea275a412a937efcf6c5 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -25,3 +25,4 @@ gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch
 dm-missing-bdput-thaw_bdev-at-removal.patch
 dm-free-minor-after-unlink-gendisk.patch
 ramfs-update-dir-mtime-and-ctime.patch
+gbefb-ip32-gbefb-depth-change-fix.patch