Commit 892c24ca authored by David Miller's avatar David Miller Committed by Paul Mundt
Browse files

arkfb: 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 94c322c3

drivers/video/arkfb.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -951,6 +951,8 @@ static struct fb_ops arkfb_ops = { 
/* PCI probe */

/* PCI probe */

static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int __devinit ark_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 arkfb_info *par;

	struct arkfb_info *par;

	int rc;

	int rc;
@@ -1006,6 +1008,15 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
		goto err_iomap;

		goto err_iomap;

	}

	}





	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;



	/* FIXME get memsize */

	/* FIXME get memsize */

	regval = vga_rseq(par->state.vgabase, 0x10);

	regval = vga_rseq(par->state.vgabase, 0x10);

	info->screen_size = (1 << (regval >> 6)) << 20;

	info->screen_size = (1 << (regval >> 6)) << 20;