Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd792aa8 authored by Woody Suwalski's avatar Woody Suwalski Committed by Linus Torvalds
Browse files

[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: default avatarWoody 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a099102

drivers/video/cyber2000fb.c

+12 −7
Original line number Diff line number Diff line
@@ -1539,9 +1539,13 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) 
	/*

	 * 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);

			printk(KERN_INFO "%s: enabling PCI bursts\n",

				cfb->fb.fix.id);



			val |= EXT_BUS_CTL_PCIBURST_WRITE;
@@ -1550,6 +1554,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) 


			cyber2000_grphw(EXT_BUS_CTL, val, cfb);

		}

	}



	return 0;

}