diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-11-20 08:42:57 -0500 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-07 21:00:09 -0500 |
commit | ca130c2267d0719c92ed188e15082d6baad6c046 (patch) | |
tree | 5a647bcca74715023e1d0ba5ef712150ca309af5 /drivers/gpu | |
parent | 2e5702aff39532662198459726c624d5eadbdd78 (diff) |
drm/nv04-nv40: Give "gpuobj->cinst" the same meaning as on nv50.
No functional changes, just simplify some code paths a bit.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ramht.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 |
3 files changed, 3 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 924653c30783..2fb7e9d47500 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c | |||
@@ -202,11 +202,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan, | |||
202 | if (gpuobj->pinst != ~0) | 202 | if (gpuobj->pinst != ~0) |
203 | gpuobj->pinst += ramin->start; | 203 | gpuobj->pinst += ramin->start; |
204 | 204 | ||
205 | if (dev_priv->card_type < NV_50) | 205 | gpuobj->cinst = ramin->start; |
206 | gpuobj->cinst = gpuobj->pinst; | ||
207 | else | ||
208 | gpuobj->cinst = ramin->start; | ||
209 | |||
210 | gpuobj->vinst = ramin->start + chan->ramin->vinst; | 206 | gpuobj->vinst = ramin->start + chan->ramin->vinst; |
211 | gpuobj->node = ramin; | 207 | gpuobj->node = ramin; |
212 | } else { | 208 | } else { |
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c index d4a2adc927d8..bef3e6910418 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ramht.c +++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c | |||
@@ -104,12 +104,12 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle, | |||
104 | nouveau_gpuobj_ref(gpuobj, &entry->gpuobj); | 104 | nouveau_gpuobj_ref(gpuobj, &entry->gpuobj); |
105 | 105 | ||
106 | if (dev_priv->card_type < NV_40) { | 106 | if (dev_priv->card_type < NV_40) { |
107 | ctx = NV_RAMHT_CONTEXT_VALID | (gpuobj->cinst >> 4) | | 107 | ctx = NV_RAMHT_CONTEXT_VALID | (gpuobj->pinst >> 4) | |
108 | (chan->id << NV_RAMHT_CONTEXT_CHANNEL_SHIFT) | | 108 | (chan->id << NV_RAMHT_CONTEXT_CHANNEL_SHIFT) | |
109 | (gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT); | 109 | (gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT); |
110 | } else | 110 | } else |
111 | if (dev_priv->card_type < NV_50) { | 111 | if (dev_priv->card_type < NV_50) { |
112 | ctx = (gpuobj->cinst >> 4) | | 112 | ctx = (gpuobj->pinst >> 4) | |
113 | (chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) | | 113 | (chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) | |
114 | (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); | 114 | (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); |
115 | } else { | 115 | } else { |
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index db32644f6114..a0bf130b02d3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
@@ -241,12 +241,6 @@ nouveau_sgdma_init(struct drm_device *dev) | |||
241 | } | 241 | } |
242 | 242 | ||
243 | if (dev_priv->card_type < NV_50) { | 243 | if (dev_priv->card_type < NV_50) { |
244 | /* special case, allocated from global instmem heap so | ||
245 | * cinst is invalid, we use it on all channels though so | ||
246 | * cinst needs to be valid, set it the same as pinst | ||
247 | */ | ||
248 | gpuobj->cinst = gpuobj->pinst; | ||
249 | |||
250 | nv_wo32(gpuobj, 0, NV_CLASS_DMA_IN_MEMORY | | 244 | nv_wo32(gpuobj, 0, NV_CLASS_DMA_IN_MEMORY | |
251 | (1 << 12) /* PT present */ | | 245 | (1 << 12) /* PT present */ | |
252 | (0 << 13) /* PT *not* linear */ | | 246 | (0 << 13) /* PT *not* linear */ | |