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

Commit 6a2f6d5e authored by David Miller's avatar David Miller Committed by Paul Mundt
Browse files

vt8623fb: Compute VGA base iomem pointer explicitly.



This allows the driver to work in multi-domain PCI
configurations.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 892c24ca
Loading
Loading
Loading
Loading
+11 −0
Original line number Original line Diff line number Diff line
@@ -661,6 +661,8 @@ static struct fb_ops vt8623fb_ops = {


static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
{
	struct pci_bus_region bus_reg;
	struct resource vga_res;
	struct fb_info *info;
	struct fb_info *info;
	struct vt8623fb_info *par;
	struct vt8623fb_info *par;
	unsigned int memsize1, memsize2;
	unsigned int memsize1, memsize2;
@@ -719,6 +721,15 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
		goto err_iomap_2;
		goto err_iomap_2;
	}
	}


	bus_reg.start = 0;
	bus_reg.end = 64 * 1024;

	vga_res.flags = IORESOURCE_IO;

	pcibios_bus_to_resource(dev, &vga_res, &bus_reg);

	par->state.vgabase = (void __iomem *) vga_res.start;

	/* Find how many physical memory there is on card */
	/* Find how many physical memory there is on card */
	memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1;
	memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1;
	memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2;
	memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2;