[PATCH] nvidiafb: Fixes for new G5

Recent X "nv" driver was fixed for various issues with modern 6xxx and 7xxx
cards.  This patch ports those fixes to nvidiafb.  This makes it work fine
on the 6600 bundled with the newest G5 macs.  I've verified it still works
on the 5200FX of the iMacG5.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index bee09c6e48f6..f6d2440e84aa 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1485,6 +1485,8 @@ static u32 __devinit nvidia_get_arch(struct pci_dev *pd)
         case 0x0210:
         case 0x0220:
         case 0x0230:
+        case 0x0290:
+        case 0x0390:
                 arch = NV_ARCH_40;
                 break;
         case 0x0020:            /* TNT, TNT2 */
@@ -1581,10 +1583,15 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
         if (par->FbMapSize > 64 * 1024 * 1024)
                 par->FbMapSize = 64 * 1024 * 1024;
 
-        par->FbUsableSize = par->FbMapSize - (128 * 1024);
+        if(par->Architecture >= NV_ARCH_40)
+                par->FbUsableSize = par->FbMapSize - (560 * 1024);
+        else
+                par->FbUsableSize = par->FbMapSize - (128 * 1024);
         par->ScratchBufferSize = (par->Architecture < NV_ARCH_10) ? 8 * 1024 :
             16 * 1024;
         par->ScratchBufferStart = par->FbUsableSize - par->ScratchBufferSize;
+        par->CursorStart = par->FbUsableSize + (32 * 1024);
+
         info->screen_base = ioremap(nvidiafb_fix.smem_start, par->FbMapSize);
         info->screen_size = par->FbUsableSize;
         nvidiafb_fix.smem_len = par->RamAmountKBytes * 1024;