summaryrefslogtreecommitdiffstats
path: root/drivers/video/vt8623fb.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 23:55:17 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 15:47:59 +0900
commit6a2f6d5e970afbc1b8b08bafae9d9138a3206960 (patch)
tree07a178adf243bff89058e136ba1f454a6bc51c09 /drivers/video/vt8623fb.c
parent892c24ca40ffebf6d0ca4cc1454e58db131a4f5a (diff)
downloadlinux-stable-6a2f6d5e970afbc1b8b08bafae9d9138a3206960.tar.gz
linux-stable-6a2f6d5e970afbc1b8b08bafae9d9138a3206960.tar.bz2
linux-stable-6a2f6d5e970afbc1b8b08bafae9d9138a3206960.zip
vt8623fb: Compute VGA base iomem pointer explicitly.
This allows the driver to work in multi-domain PCI configurations. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/vt8623fb.c')
-rw-r--r--drivers/video/vt8623fb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index eee01a2ae8c9..f9b3e3dc2421 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;