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

Commit a01c8cb1 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Kyle McMartin
Browse files

[PARISC] Fix GSC graphics cards with 64MB regions 



Make knapps work with its 64MB gfx card.  I probably just broke another
machine in the process, but assuming 64MB when 64MB aligned is probably
safer than assuming 32MB all the time.

Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent e0565a1c

arch/parisc/kernel/drivers.c

+8 −3
Original line number Diff line number Diff line
@@ -515,8 +515,13 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) 
			(iodc_data[5] << 8) | iodc_data[6];

	dev->hpa.name = parisc_pathname(dev);

	dev->hpa.start = hpa;

	if (hpa == 0xf4000000 || hpa == 0xf6000000 ||

	    hpa == 0xf8000000 || hpa == 0xfa000000) {

	/* This is awkward.  The STI spec says that gfx devices may occupy

	 * 32MB or 64MB.  Unfortunately, we don't know how to tell whether

	 * it's the former or the latter.  Assumptions either way can hurt us.

	 */

	if (hpa == 0xf4000000 || hpa == 0xf8000000) {

		dev->hpa.end = hpa + 0x03ffffff;

	} else if (hpa == 0xf6000000 || hpa == 0xfa000000) {

		dev->hpa.end = hpa + 0x01ffffff;

	} else {

		dev->hpa.end = hpa + 0xfff;