From 2ff931096f96702c88ac2e7343a65ba25f3c1bb5 Mon Sep 17 00:00:00 2001
From: Roy Spliet <r.spliet@student.tudelft.nl>
Date: Mon, 4 Oct 2010 23:01:08 +0200
Subject: [PATCH] --- yaml --- r: 218248 b: refs/heads/master c:
 a845fff841b13678b2d80f10425aba87db840e4a h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 31692535d08a..c3be0f8fe810 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca8e7c6ccdfb9a77de9b9719e6ef768373fb607c
+refs/heads/master: a845fff841b13678b2d80f10425aba87db840e4a
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
index 00b31b5e16cd..a163c7c612e7 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -35,6 +35,8 @@
 #include "drm_sarea.h"
 #include "nouveau_drv.h"
 
+#define MIN(a,b) a < b ? a : b
+
 /*
  * NV10-NV40 tiling helpers
  */
@@ -717,14 +719,14 @@ nouveau_mem_timing_init(struct drm_device *dev)
 		tUNK_19 = 1;
 		tUNK_20 = 0;
 		tUNK_21 = 0;
-		switch (recordlen) {
-		case 0x21:
+		switch (MIN(recordlen,21)) {
+		case 21:
 			tUNK_21 = entry[21];
-		case 0x20:
+		case 20:
 			tUNK_20 = entry[20];
-		case 0x19:
+		case 19:
 			tUNK_19 = entry[19];
-		case 0x18:
+		case 18:
 			tUNK_18 = entry[18];
 		default:
 			tUNK_0  = entry[0];