Commit 94c322c3 authored by David Miller's avatar David Miller Committed by Paul Mundt

s3fb: 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 0144a256
...@@ -934,6 +934,8 @@ static int __devinit s3_identification(struct s3fb_info *par) ...@@ -934,6 +934,8 @@ static int __devinit s3_identification(struct s3fb_info *par)
static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int __devinit s3_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 s3fb_info *par; struct s3fb_info *par;
int rc; int rc;
...@@ -983,6 +985,15 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -983,6 +985,15 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
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;
/* Unlock regs */ /* Unlock regs */
cr38 = vga_rcrt(par->state.vgabase, 0x38); cr38 = vga_rcrt(par->state.vgabase, 0x38);
cr39 = vga_rcrt(par->state.vgabase, 0x39); cr39 = vga_rcrt(par->state.vgabase, 0x39);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment