ChangeSet 1.2299, 2005/03/31 08:48:00-08:00, [EMAIL PROTECTED]

        [PATCH] neofb: mmio fixes
        
        Changes in neo_map_mmio to make neofb working on NM2070, NM2090, NM2093.
        
        From: Marek Marczykowski <[EMAIL PROTECTED]>
        Signed-off-by: Marek Marczykowski <[EMAIL PROTECTED]>
        Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
        Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>



 neofb.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletion(-)


diff -Nru a/drivers/video/neofb.c b/drivers/video/neofb.c
--- a/drivers/video/neofb.c     2005-03-31 10:27:29 -08:00
+++ b/drivers/video/neofb.c     2005-03-31 10:27:29 -08:00
@@ -1691,7 +1691,27 @@
 
        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
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to