diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-10-19 00:18:06 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:10:54 -0500 |
commit | 1e96268aca1bb40f42bdbc9d2293b123b072f1de (patch) | |
tree | e17f06ea78f5a38e2a14478872cc67a05be86fa9 /drivers/gpu/drm/nouveau/nouveau_ramht.c | |
parent | b7bc613a4cc08d867b43189c2af0bb83b1fa1dc6 (diff) |
drm/nv50: initial work to allow multiple evo channels
This doesn't work yet for unknown reasons.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c index b4c63c058888..d4a2adc927d8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ramht.c +++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c | |||
@@ -114,7 +114,7 @@ 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) | 2; | 117 | ctx = (gpuobj->cinst << 10) | chan->id; |
118 | } else { | 118 | } else { |
119 | ctx = (gpuobj->cinst >> 4) | | 119 | ctx = (gpuobj->cinst >> 4) | |
120 | ((gpuobj->engine << | 120 | ((gpuobj->engine << |