drm/nouveau/mmu: index engref by subdev type

None of the chipsets we use this on have instanced engines, so this is fine.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
index 0409c69daacb9c518bbb6f6dee2b52b8dd42c8a4..cc05c91798ff560a95f2dcfeeb0ce7546eecd30d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
@@ -118,7 +118,7 @@ nvkm_fifo_chan_child_del(struct nvkm_oproxy *base)
                        chan->func->engine_dtor(chan, engine);
                nvkm_object_del(&engn->object);
                if (chan->vmm)
-                       atomic_dec(&chan->vmm->engref[engine->subdev.index]);
+                       atomic_dec(&chan->vmm->engref[engine->subdev.type]);
        }
 }
 
@@ -152,7 +152,7 @@ nvkm_fifo_chan_child_new(const struct nvkm_oclass *oclass, void *data, u32 size,
                };
 
                if (chan->vmm)
-                       atomic_inc(&chan->vmm->engref[engine->subdev.index]);
+                       atomic_inc(&chan->vmm->engref[engine->subdev.type]);
 
                if (engine->func->fifo.cclass) {
                        ret = engine->func->fifo.cclass(chan, &cclass,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
index 5800cda68e0c2a030b7a173641098656d03521e1..b7548dcd72c779d68885f56357f8ceb148c90ee1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
@@ -207,7 +207,7 @@ nv50_vmm_flush(struct nvkm_vmm *vmm, int level)
                case NVKM_ENGINE_MSVLD : id = 0x09; break;
                case NVKM_ENGINE_CIPHER:
                case NVKM_ENGINE_SEC   : id = 0x0a; break;
-               case NVKM_ENGINE_CE0   : id = 0x0d; break;
+               case NVKM_ENGINE_CE    : id = 0x0d; break;
                default:
                        continue;
                }