From eaf0d5ac2d6b44e79fb56850ba090038ebb0afb5 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sun, 19 Aug 2012 15:58:38 +1000
Subject: [PATCH] --- yaml --- r: 329659 b: refs/heads/master c:
 1971f04e16172db79b8b0eed75fb2cb82adfbb83 h: refs/heads/master i:   329657:
 0ba58c7bd573d3dbcef0d266a73985c2ec5121ea   329655:
 73225736265c24fd7437555951c514ba90f3a490 v: v3

---
 [refs]                                              |  2 +-
 .../gpu/drm/nouveau/core/engine/dmaobj/nv04.c       | 13 ++++++++-----
 .../gpu/drm/nouveau/core/engine/dmaobj/nv50.c       | 13 ++++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 94ae17bc8a6c..2f05c818382d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9456f7d1beb8f7cfd99300e6028b3b2667c2ebd5
+refs/heads/master: 1971f04e16172db79b8b0eed75fb2cb82adfbb83
diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c b/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
index 848aa3bdacd1..5ad76f74416f 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
@@ -23,6 +23,7 @@
  */
 
 #include <core/gpuobj.h>
+#include <core/class.h>
 
 #include <subdev/fb.h>
 #include <subdev/vm/nv04.h>
@@ -118,16 +119,18 @@ nv04_dmaobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 		return ret;
 
 	switch (nv_mclass(parent)) {
-	case 0x006b:
-	case 0x006e:
-	case 0x176e:
-	case 0x406e:
+	case NV_DEVICE_CLASS:
+		break;
+	case NV03_CHANNEL_DMA_CLASS:
+	case NV10_CHANNEL_DMA_CLASS:
+	case NV17_CHANNEL_DMA_CLASS:
+	case NV40_CHANNEL_DMA_CLASS:
 		ret = dmaeng->bind(dmaeng, *pobject, &dmaobj->base, &gpuobj);
 		nouveau_object_ref(NULL, pobject);
 		*pobject = nv_object(gpuobj);
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	return ret;
diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
index be5c0df644db..045d2565e289 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
@@ -23,6 +23,7 @@
  */
 
 #include <core/gpuobj.h>
+#include <core/class.h>
 
 #include <subdev/fb.h>
 #include <engine/dmaobj.h>
@@ -109,16 +110,18 @@ nv50_dmaobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 		return ret;
 
 	switch (nv_mclass(parent)) {
-	case 0x506e:
-	case 0x506f:
-	case 0x826e:
-	case 0x826f:
+	case NV_DEVICE_CLASS:
+		break;
+	case NV50_CHANNEL_DMA_CLASS:
+	case NV84_CHANNEL_DMA_CLASS:
+	case NV50_CHANNEL_IND_CLASS:
+	case NV84_CHANNEL_IND_CLASS:
 		ret = dmaeng->bind(dmaeng, *pobject, &dmaobj->base, &gpuobj);
 		nouveau_object_ref(NULL, pobject);
 		*pobject = nv_object(gpuobj);
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	return ret;