From 8316ea7d36de25ae4ad12ed71fed74f867fe51a5 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Mon, 26 Jun 2006 00:26:38 -0700
Subject: [PATCH] --- yaml --- r: 30295 b: refs/heads/master c:
 fe610671d7a88e363e8cebcb7e2f32078b0151ce h: refs/heads/master i:   30293:
 8e83b5ead564fbb24e9c22f09dfd5be1b17cc641   30291:
 ede9ed96d5d35abfb13b9fc43d4e11067bbbfb0b   30287:
 67ecc9119eafa8a270afc0f3558094f6befa8147 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/video/nvidia/nv_hw.c  | 10 ++++++++--
 trunk/drivers/video/nvidia/nvidia.c |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6c8a557cf85f..a82288e6d2bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba70710e59c701734aad524bc441b3400700e94b
+refs/heads/master: fe610671d7a88e363e8cebcb7e2f32078b0151ce
diff --git a/trunk/drivers/video/nvidia/nv_hw.c b/trunk/drivers/video/nvidia/nv_hw.c
index 99c3a8e6a237..9ed640d35728 100644
--- a/trunk/drivers/video/nvidia/nv_hw.c
+++ b/trunk/drivers/video/nvidia/nv_hw.c
@@ -886,7 +886,10 @@ void NVCalcStateExt(struct nvidia_par *par,
 	case NV_ARCH_20:
 	case NV_ARCH_30:
 	default:
-		if (((par->Chipset & 0xffff) == 0x01A0) ||
+		if ((par->Chipset & 0xfff0) == 0x0240) {
+			state->arbitration0 = 256;
+			state->arbitration1 = 0x0480;
+		} else if (((par->Chipset & 0xffff) == 0x01A0) ||
 		    ((par->Chipset & 0xffff) == 0x01f0)) {
 			nForceUpdateArbitrationSettings(VClk,
 							pixelDepth * 8,
@@ -1235,6 +1238,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
 					break;
 				case 0x0160:
 				case 0x01D0:
+				case 0x0240:
 					NV_WR32(par->PMC, 0x1700,
 						NV_RD32(par->PFB, 0x020C));
 					NV_WR32(par->PMC, 0x1704, 0);
@@ -1359,7 +1363,9 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
 						if(((par->Chipset & 0xfff0)
 						    != 0x0160) &&
 						   ((par->Chipset & 0xfff0)
-						    != 0x0220))
+						    != 0x0220) &&
+						   ((par->Chipset & 0xfff0)
+						    != 0x240))
 							NV_WR32(par->PGRAPH,
 								0x6900 + i*4,
 								NV_RD32(par->PFB,
diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c
index 08eab09ae536..65733e834704 100644
--- a/trunk/drivers/video/nvidia/nvidia.c
+++ b/trunk/drivers/video/nvidia/nvidia.c
@@ -1171,6 +1171,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
 	case 0x0210:
 	case 0x0220:
 	case 0x0230:
+	case 0x0240:
 	case 0x0290:
 	case 0x0390:
 		arch = NV_ARCH_40;