Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nv04-nv40: Give "gpuobj->cinst" the same meaning as on nv50.

Browse Source 
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>
This commit is contained in:
Francisco Jerez 2010-11-20 14:42:57 +01:00
parent 2e5702aff3
commit ca130c2267
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nouveau_object.c
View File

@ -202,11 +202,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
if (gpuobj->pinst != ~0) if (gpuobj->pinst != ~0)
gpuobj->pinst += ramin->start; gpuobj->pinst += ramin->start;
if (dev_priv->card_type < NV_50) gpuobj->cinst = ramin->start;
gpuobj->cinst = gpuobj->pinst;
else
gpuobj->cinst = ramin->start;
gpuobj->vinst = ramin->start + chan->ramin->vinst; gpuobj->vinst = ramin->start + chan->ramin->vinst;
gpuobj->node = ramin; gpuobj->node = ramin;
} else { } else {

4
drivers/gpu/drm/nouveau/nouveau_ramht.c
View File

@ -104,12 +104,12 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle,
nouveau_gpuobj_ref(gpuobj, &entry->gpuobj); nouveau_gpuobj_ref(gpuobj, &entry->gpuobj);
if (dev_priv->card_type < NV_40) { 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) | (chan->id << NV_RAMHT_CONTEXT_CHANNEL_SHIFT) |
(gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT); (gpuobj->engine << NV_RAMHT_CONTEXT_ENGINE_SHIFT);
} else } else
if (dev_priv->card_type < NV_50) { if (dev_priv->card_type < NV_50) {
ctx = (gpuobj->cinst >> 4) | ctx = (gpuobj->pinst >> 4) |
(chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) | (chan->id << NV40_RAMHT_CONTEXT_CHANNEL_SHIFT) |
(gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT);
} else { } else {

6
drivers/gpu/drm/nouveau/nouveau_sgdma.c
View File

@ -241,12 +241,6 @@ nouveau_sgdma_init(struct drm_device *dev)
} }
if (dev_priv->card_type < NV_50) { 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 | nv_wo32(gpuobj, 0, NV_CLASS_DMA_IN_MEMORY |
(1 << 12) /* PT present */ | (1 << 12) /* PT present */ |
(0 << 13) /* PT *not* linear */ | (0 << 13) /* PT *not* linear */ |