drm/nouveau/nvdec/gp102-: utilise engine PRI address from TOP

Turing has its NVDEC instances in an alternate location.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
index fe716859d4a92d7d5f88d47f4d0a60a364ed31e8..b72a4844c5f7b4ec9d24662d265d23d933dae534 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
@@ -6,6 +6,8 @@
 
 struct nvkm_nvdec {
        struct nvkm_engine engine;
+       u32 addr;
+
        struct nvkm_falcon *falcon;
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
index 4807021fd9906770efb29578187aea7e54f44c34..4a63581bdd5e174a575982a48335197bc1c1561c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
@@ -21,13 +21,21 @@
  */
 #include "priv.h"
 
+#include <subdev/top.h>
 #include <engine/falcon.h>
 
 static int
 nvkm_nvdec_oneinit(struct nvkm_engine *engine)
 {
        struct nvkm_nvdec *nvdec = nvkm_nvdec(engine);
-       return nvkm_falcon_v1_new(&nvdec->engine.subdev, "NVDEC", 0x84000,
+       struct nvkm_subdev *subdev = &nvdec->engine.subdev;
+
+       nvdec->addr = nvkm_top_addr(subdev->device, subdev->index);
+       if (!nvdec->addr)
+               return -EINVAL;
+
+       /*XXX: fix naming of this when adding support for multiple-NVDEC */
+       return nvkm_falcon_v1_new(subdev, "NVDEC", nvdec->addr,
                                  &nvdec->falcon);
 }