s3fb: 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>
This commit is contained in:
parent
0144a2568c
commit
94c322c30b
|
@ -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)
|
||||
{
|
||||
struct pci_bus_region bus_reg;
|
||||
struct resource vga_res;
|
||||
struct fb_info *info;
|
||||
struct s3fb_info *par;
|
||||
int rc;
|
||||
|
@ -983,6 +985,15 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
|
|||
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 */
|
||||
cr38 = vga_rcrt(par->state.vgabase, 0x38);
|
||||
cr39 = vga_rcrt(par->state.vgabase, 0x39);
|
||||
|
|
Loading…
Reference in a new issue