diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-11-20 14:42:57 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-08 03:00:09 +0100 |
| commit | ca130c2267d0719c92ed188e15082d6baad6c046 (patch) | |
| tree | 5a647bcca74715023e1d0ba5ef712150ca309af5 /drivers/gpu/drm/nouveau/nouveau_ramht.c | |
| parent | 2e5702aff39532662198459726c624d5eadbdd78 (diff) | |
| download | lwn-ca130c2267d0719c92ed188e15082d6baad6c046.tar.gz lwn-ca130c2267d0719c92ed188e15082d6baad6c046.zip | |
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_ramht.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ramht.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, 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 { |