diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:55:17 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:47:59 -0400 |
commit | 6a2f6d5e970afbc1b8b08bafae9d9138a3206960 (patch) | |
tree | 07a178adf243bff89058e136ba1f454a6bc51c09 /drivers/video | |
parent | 892c24ca40ffebf6d0ca4cc1454e58db131a4f5a (diff) |
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')
-rw-r--r-- | drivers/video/vt8623fb.c | 11 |
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 = { | |||
661 | 661 | ||
662 | static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | 662 | static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) |
663 | { | 663 | { |
664 | struct pci_bus_region bus_reg; | ||
665 | struct resource vga_res; | ||
664 | struct fb_info *info; | 666 | struct fb_info *info; |
665 | struct vt8623fb_info *par; | 667 | struct vt8623fb_info *par; |
666 | unsigned int memsize1, memsize2; | 668 | unsigned int memsize1, memsize2; |
@@ -719,6 +721,15 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi | |||
719 | goto err_iomap_2; | 721 | goto err_iomap_2; |
720 | } | 722 | } |
721 | 723 | ||
724 | bus_reg.start = 0; | ||
725 | bus_reg.end = 64 * 1024; | ||
726 | |||
727 | vga_res.flags = IORESOURCE_IO; | ||
728 | |||
729 | pcibios_bus_to_resource(dev, &vga_res, &bus_reg); | ||
730 | |||
731 | par->state.vgabase = (void __iomem *) vga_res.start; | ||
732 | |||
722 | /* Find how many physical memory there is on card */ | 733 | /* Find how many physical memory there is on card */ |
723 | memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1; | 734 | memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1; |
724 | memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2; | 735 | memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2; |