* [PATCH 6/7] neofb: mmio fixes
@ 2005-03-20 13:09 Antonino A. Daplas
2005-03-20 21:05 ` [PATCH 6/7] [RESEND] " Antonino A. Daplas
0 siblings, 1 reply; 2+ messages in thread
From: Antonino A. Daplas @ 2005-03-20 13:09 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Fbdev development list, Marek Marczykowski
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>
---
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-12 23:23:15 +08:00
+++ b/drivers/video/neofb.c 2005-03-19 05:33:32 +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
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 6/7] [RESEND] neofb: mmio fixes
2005-03-20 13:09 [PATCH 6/7] neofb: mmio fixes Antonino A. Daplas
@ 2005-03-20 21:05 ` Antonino A. Daplas
0 siblings, 0 replies; 2+ messages in thread
From: Antonino A. Daplas @ 2005-03-20 21:05 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Fbdev development list, Marek Marczykowski
Forgot to sign off.
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: Antonino Daplas <adaplas@pol.net>
---
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-12 23:23:15 +08:00
+++ b/drivers/video/neofb.c 2005-03-19 05:33:32 +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
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-03-20 21:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-20 13:09 [PATCH 6/7] neofb: mmio fixes Antonino A. Daplas
2005-03-20 21:05 ` [PATCH 6/7] [RESEND] " Antonino A. Daplas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).