Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] cyber2010 framebuffer on ARM Netwinder fix

The Netwinder machines with Cyber2010 crash badly when starting Xserver.
The workaround is to disable pci burst option for this revision of video
chip.

[akpm@osdl.org: cleanup]
Signed-off-by: Woody Suwalski <woodys@xandros.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Woody Suwalski and committed by
Linus Torvalds
cd792aa8 3a099102

+12 -7
+12 -7
drivers/video/cyber2000fb.c
··· 1539 1539 /* 1540 1540 * Allow the CyberPro to accept PCI burst accesses 1541 1541 */ 1542 - val = cyber2000_grphr(EXT_BUS_CTL, cfb); 1543 - if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) { 1544 - printk(KERN_INFO "%s: enabling PCI bursts\n", cfb->fb.fix.id); 1542 + if (cfb->id == ID_CYBERPRO_2010) { 1543 + printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id); 1544 + } else { 1545 + val = cyber2000_grphr(EXT_BUS_CTL, cfb); 1546 + if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) { 1547 + printk(KERN_INFO "%s: enabling PCI bursts\n", 1548 + cfb->fb.fix.id); 1545 1549 1546 - val |= EXT_BUS_CTL_PCIBURST_WRITE; 1550 + val |= EXT_BUS_CTL_PCIBURST_WRITE; 1547 1551 1548 - if (cfb->id == ID_CYBERPRO_5000) 1549 - val |= EXT_BUS_CTL_PCIBURST_READ; 1552 + if (cfb->id == ID_CYBERPRO_5000) 1553 + val |= EXT_BUS_CTL_PCIBURST_READ; 1550 1554 1551 - cyber2000_grphw(EXT_BUS_CTL, val, cfb); 1555 + cyber2000_grphw(EXT_BUS_CTL, val, cfb); 1556 + } 1552 1557 } 1553 1558 1554 1559 return 0;