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/drm/nouveau/nouveau_sgdma.c | |
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/drm/nouveau/nouveau_sgdma.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 |
1 files changed, 0 insertions, 6 deletions
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 */ | |