summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 23:54:35 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 15:47:55 +0900
commit892c24ca40ffebf6d0ca4cc1454e58db131a4f5a (patch)
treea24f08fe9aed474cf762d3b02ad60621f4077f7a /drivers
parent94c322c30bd14ae6cdd369cb4a1f94c5c3809ac9 (diff)
arkfb: 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')
-rw-r--r--drivers/video/arkfb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 1c69db310ed5..8686429cbdf0 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -951,6 +951,8 @@ static struct fb_ops arkfb_ops = {
/* PCI probe */
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 arkfb_info *par;
int rc;
@@ -1006,6 +1008,15 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
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 */
regval = vga_rseq(par->state.vgabase, 0x10);
info->screen_size = (1 << (regval >> 6)) << 20;