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

[Martin Michlmayr]

Author: tbm
Date: Thu Jan  4 20:30:23 2007
New Revision: 8092

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
arm: Turn off PCI burst on the Cyber2010, otherwise X11 on
Netwinder will crash.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Jan  4 20:30:23 2007
@@ -13,6 +13,8 @@
     (see #404950).
   * arm: Implement flush_anon_page(), which is needed for FUSE
     (closes: #402876) and possibly dm-crypt/LUKS (see #403426).
+  * arm: Turn off PCI burst on the Cyber2010, otherwise X11 on
+    Netwinder will crash.
 
   [ Bastian Blank ]
   * Bump ABI to 4.

Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch	Thu Jan  4 20:30:23 2007
@@ -0,0 +1,30 @@
+The Netwinder machines with Cyber2010 crash badly when starting Xserver.
+The workaround is to disable pci burst option for this revision of video chip.
+
+Signed-off-by: Woody Suwalski <woodys at xandros.com>
+
+---
+
+--- a/drivers/video/cyber2000fb.c	2006-04-21 12:11:45.000000000 -0400
++++ b/drivers/video/cyber2000fb.c	2006-04-26 16:29:44.000000000 -0400
+@@ -1541,6 +1541,12 @@ static int cyberpro_pci_enable_mmio(stru
+ 	/*
+ 	 * Allow the CyberPro to accept PCI burst accesses
+ 	 */
++	if (cfb->id == ID_CYBERPRO_2010)
++	{
++		printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id);
++	}
++	else
++	{
+ 	val = cyber2000_grphr(EXT_BUS_CTL, cfb);
+ 	if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
+ 		printk(KERN_INFO "%s: enabling PCI bursts\n", cfb->fb.fix.id);
+@@ -1552,6 +1558,7 @@ static int cyberpro_pci_enable_mmio(stru
+ 
+ 		cyber2000_grphw(EXT_BUS_CTL, val, cfb);
+ 	}
++	}
+ 
+ 	return 0;
+ }

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Thu Jan  4 20:30:23 2007
@@ -45,3 +45,4 @@
 + bugfix/ia64-hardcode-arch-script-output.patch
 + bugfix/flush_anon_page-generic.patch
 + bugfix/flush_anon_page-arm.patch
++ bugfix/arm/cyber2010_burst.patch