From 68710990775c69fe7bfc200a04416d36a74a02e0 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 20 Nov 2010 14:42:57 +0100
Subject: [PATCH] --- yaml --- r: 228584 b: refs/heads/master c:
 ca130c2267d0719c92ed188e15082d6baad6c046 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_object.c | 6 +-----
 trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c  | 4 ++--
 trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c  | 6 ------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f51c23ffc502..33ddb711a902 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e5702aff39532662198459726c624d5eadbdd78
+refs/heads/master: ca130c2267d0719c92ed188e15082d6baad6c046
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
index 924653c30783..2fb7e9d47500 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -202,11 +202,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
 		if (gpuobj->pinst != ~0)
 			gpuobj->pinst += ramin->start;
 
-		if (dev_priv->card_type < NV_50)
-			gpuobj->cinst = gpuobj->pinst;
-		else
-			gpuobj->cinst = ramin->start;
-
+		gpuobj->cinst = ramin->start;
 		gpuobj->vinst = ramin->start + chan->ramin->vinst;
 		gpuobj->node  = ramin;
 	} else {
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c b/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
index d4a2adc927d8..bef3e6910418 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
@@ -104,12 +104,12 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle,
 	nouveau_gpuobj_ref(gpuobj, &entry->gpuobj);
 
 	if (dev_priv->card_type < NV_40) {
-		ctx = NV_RAMHT_CONTEXT_VALID | (gpuobj->cinst >> 4) |
+		ctx = NV_RAMHT_CONTEXT_VALID | (gpuobj->pinst >> 4) |
 		      (chan->id << NV_RAMHT_CONTEXT_CHANNEL_SHIFT) |
 		      (gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT);
 	} else
 	if (dev_priv->card_type < NV_50) {
-		ctx = (gpuobj->cinst >> 4) |
+		ctx = (gpuobj->pinst >> 4) |
 		      (chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) |
 		      (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT);
 	} else {
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index db32644f6114..a0bf130b02d3 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -241,12 +241,6 @@ nouveau_sgdma_init(struct drm_device *dev)
 	}
 
 	if (dev_priv->card_type < NV_50) {
-		/* special case, allocated from global instmem heap so
-		 * cinst is invalid, we use it on all channels though so
-		 * cinst needs to be valid, set it the same as pinst
-		 */
-		gpuobj->cinst = gpuobj->pinst;
-
 		nv_wo32(gpuobj, 0, NV_CLASS_DMA_IN_MEMORY |
 				   (1 << 12) /* PT present */ |
 				   (0 << 13) /* PT *not* linear */ |