diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2005-03-30 16:48:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-30 16:48:00 -0800 |
| commit | 8423c85771f3bf675659acb2ae202fff17e6cb93 (patch) | |
| tree | f39bb2906fe6d5958e7cfe0e67fb8221c75097dc | |
| parent | 075f215de04547028131c425079712d4888f0d5a (diff) | |
| download | history-8423c85771f3bf675659acb2ae202fff17e6cb93.tar.gz | |
[PATCH] neofb: mmio fixes
Changes in neo_map_mmio to make neofb working on NM2070, NM2090, NM2093.
From: Marek Marczykowski <marmarek@staszic.waw.pl>
Signed-off-by: Marek Marczykowski <marmarek@staszic.waw.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/neofb.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index 085b4704a46ef8..e46b8bcab0c7c7 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c @@ -1691,7 +1691,27 @@ static int __devinit neo_map_mmio(struct fb_info *info, DBG("neo_map_mmio"); - info->fix.mmio_start = pci_resource_start(dev, 1); + switch (info->fix.accel) { + case FB_ACCEL_NEOMAGIC_NM2070: + info->fix.mmio_start = pci_resource_start(dev, 0)+ + 0x100000; + break; + case FB_ACCEL_NEOMAGIC_NM2090: + case FB_ACCEL_NEOMAGIC_NM2093: + info->fix.mmio_start = pci_resource_start(dev, 0)+ + 0x200000; + break; + case FB_ACCEL_NEOMAGIC_NM2160: + case FB_ACCEL_NEOMAGIC_NM2097: + case FB_ACCEL_NEOMAGIC_NM2200: + case FB_ACCEL_NEOMAGIC_NM2230: + case FB_ACCEL_NEOMAGIC_NM2360: + case FB_ACCEL_NEOMAGIC_NM2380: + info->fix.mmio_start = pci_resource_start(dev, 1); + break; + default: + info->fix.mmio_start = pci_resource_start(dev, 0); + } info->fix.mmio_len = MMIO_SIZE; if (!request_mem_region |