[kernel] r12558 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Sat Jan 10 01:12:41 2009
New Revision: 12558

Log:
Skip incompatible fbdev logos (Closes: #508173)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/fbdev-check-logo-compat.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jan 10 01:12:41 2009
@@ -24,7 +24,8 @@
   * Register DualPoint model found in Dell Latitude E6500 (Closes: #507958)
   * Disable link tuning in rt2500usb driver. (Closes: #510607)
   * Fix regressions in eata driver (Closes: #506835)
-
+  * Skip incompatible fbdev logos (Closes: #508173)
+  
   [ Martin Michlmayr ]
   * V4L/DVB: Fix initialization of URB list (Thomas Reitmayr) to address
     the oops reported at http://forum.qnap.com/viewtopic.php?f=147&t=10572
@@ -38,7 +39,7 @@
     - Add missing calls to plat_unmap_dma_mem.
     - Only write c0_framemask on CPUs which have this register.
 
- -- dann frazier <dannf at debian.org>  Fri, 09 Jan 2009 18:06:44 -0700
+ -- dann frazier <dannf at debian.org>  Fri, 09 Jan 2009 18:10:41 -0700
 
 linux-2.6 (2.6.26-12) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/fbdev-check-logo-compat.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/fbdev-check-logo-compat.patch	Sat Jan 10 01:12:41 2009
@@ -0,0 +1,41 @@
+commit 4fb6de2561d5c47f3539a7b412108164d79fbb96
+Author: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
+Date:   Tue Jan 6 14:42:37 2009 -0800
+
+    fbdev/logo: check compatibility of main and extra logos
+    
+    The code to draw penguin logos always uses some properties of the main logo.
+    This is incorrect if additional logos (CONFIG_FB_LOGO_EXTRA=y) have different
+    types than the main logo, which causes corrupted logo images.
+    
+      http://bugzilla.kernel.org/show_bug.cgi?id=12181
+    
+    Hence skip additional logos that are not compatible with the main logo.
+    
+    Technically, it's possible to draw multiple logos of different types on
+    truecolor displays, but this would complicate the (already quite
+    complicated) logo drawing code even more.
+    
+    This patch fixes a problem with Debian's linux-image-2.6.26-1-powerpc64
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508173
+    
+    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
+    Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
+    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
+index 3c65b0d..756efeb 100644
+--- a/drivers/video/fbmem.c
++++ b/drivers/video/fbmem.c
+@@ -510,6 +510,10 @@ static int fb_prepare_extra_logos(struct fb_info *info, unsigned int height,
+ 		fb_logo_ex_num = 0;
+ 
+ 	for (i = 0; i < fb_logo_ex_num; i++) {
++		if (fb_logo_ex[i].logo->type != fb_logo.logo->type) {
++			fb_logo_ex[i].logo = NULL;
++			continue;
++		}
+ 		height += fb_logo_ex[i].logo->height;
+ 		if (height > yres) {
+ 			height -= fb_logo_ex[i].logo->height;

Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13	(original)
+++ dists/sid/linux-2.6/debian/patches/series/13	Sat Jan 10 01:12:41 2009
@@ -21,3 +21,4 @@
 + bugfix/ia64/add-efi-rtc-class-driver.patch
 + bugfix/parisc/userspace-unwind-crash.patch
 + bugfix/enforce-minimum-SG_IO-timeout.patch
++ bugfix/all/fbdev-check-logo-compat.patch