Commit 1e96268a authored by Ben Skeggs's avatar Ben Skeggs

drm/nv50: initial work to allow multiple evo channels

This doesn't work yet for unknown reasons.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b7bc613a
...@@ -689,6 +689,7 @@ struct drm_nouveau_private { ...@@ -689,6 +689,7 @@ struct drm_nouveau_private {
struct backlight_device *backlight; struct backlight_device *backlight;
struct nouveau_channel *evo; struct nouveau_channel *evo;
u32 evo_alloc;
struct { struct {
struct dcb_entry *dcb; struct dcb_entry *dcb;
u16 script; u16 script;
......
...@@ -114,7 +114,7 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle, ...@@ -114,7 +114,7 @@ nouveau_ramht_insert(struct nouveau_channel *chan, u32 handle,
(gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT); (gpuobj->engine << NV40_RAMHT_CONTEXT_ENGINE_SHIFT);
} else { } else {
if (gpuobj->engine == NVOBJ_ENGINE_DISPLAY) { if (gpuobj->engine == NVOBJ_ENGINE_DISPLAY) {
ctx = (gpuobj->cinst << 10) | 2; ctx = (gpuobj->cinst << 10) | chan->id;
} else { } else {
ctx = (gpuobj->cinst >> 4) | ctx = (gpuobj->cinst >> 4) |
((gpuobj->engine << ((gpuobj->engine <<
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment