From: David Miller Date: Tue, 11 Jan 2011 23:55:17 +0000 (+0000) Subject: vt8623fb: Compute VGA base iomem pointer explicitly. X-Git-Tag: v3.12-rc1~6555^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a2f6d5e970afbc1b8b08bafae9d9138a3206960;p=kernel%2Fkernel-generic.git vt8623fb: Compute VGA base iomem pointer explicitly. This allows the driver to work in multi-domain PCI configurations. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt --- diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index eee01a2..f9b3e3d 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c @@ -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) { + struct pci_bus_region bus_reg; + struct resource vga_res; struct fb_info *info; struct vt8623fb_info *par; 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; } + 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 */ memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1; memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2;