diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-31 19:41:01 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 15:44:48 -0500 |
commit | 961b6e686ec73cfd2721c4e13745a8fe43e04350 (patch) | |
tree | 9fc7d48ef71ac7ed4a489533aaa800e84bc1050b /drivers/gpu/drm/nouveau/nouveau_ramht.c | |
parent | 30d81817a2a7eefcf4aa8b703d5f8330451c2648 (diff) |
drm/nv50-nvc0: fix ramht entries for multiple evo channels
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, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c index bef3e6910418..a24a81f5a89e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ramht.c +++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c | |||
@@ -114,7 +114,9 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle, | |||
114 | (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); | 114 | (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); |
115 | } else { | 115 | } else { |
116 | if (gpuobj->engine == NVOBJ_ENGINE_DISPLAY) { | 116 | if (gpuobj->engine == NVOBJ_ENGINE_DISPLAY) { |
117 | ctx = (gpuobj->cinst << 10) | chan->id; | 117 | ctx = (gpuobj->cinst << 10) | |
118 | (chan->id << 28) | | ||
119 | chan->id; /* HASH_TAG */ | ||
118 | } else { | 120 | } else { |
119 | ctx = (gpuobj->cinst >> 4) | | 121 | ctx = (gpuobj->cinst >> 4) | |
120 | ((gpuobj->engine << | 122 | ((gpuobj->engine << |