drm/nouveau/nvkm: bump maximum number of NVJPG

RM (and GH100) support 8 NVJPG instances.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-4-skeggsb@gmail.com

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h b/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
index f326b09680be083fc5c9daa9e07f0d3fcc46a17d..6af0352a4873743ae732ae48f24465c5524ec0a2 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
@@ -44,7 +44,7 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP   , struct nvkm_engine  ,    msppp)
 NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD   , struct nvkm_engine  ,    msvld)
 NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC   , struct nvkm_nvdec   ,    nvdec, 8)
 NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC   , struct nvkm_nvenc   ,    nvenc, 3)
-NVKM_LAYOUT_ONCE(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,    nvjpg)
+NVKM_LAYOUT_INST(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,    nvjpg, 8)
 NVKM_LAYOUT_ONCE(NVKM_ENGINE_OFA     , struct nvkm_engine  ,      ofa)
 NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM      , struct nvkm_pm      ,       pm)
 NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC     , struct nvkm_engine  ,      sec)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
index 84790cf52b9029b97cc62da1e08d9f8ae1a96950..4fa6e2f19bfe937743aafa9362c965f8d6da23f1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
@@ -76,7 +76,7 @@ ga100_top_parse(struct nvkm_top *top)
                case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;
                case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;
                case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;
-               case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;
+               case 0x00000015: I_(NVKM_ENGINE_NVJPG , inst); break;
                case 0x00000016: O_(NVKM_ENGINE_OFA   ,    0); break;
                case 0x00000017: O_(NVKM_SUBDEV_FLA   ,    0); break;
                        break;

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
index 2bbba8244cbf14354007984206b39ac417cd7123..0f1675e57256b18e30013ce2b48712849553f79c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
@@ -89,7 +89,7 @@ gk104_top_parse(struct nvkm_top *top)
                case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;
                case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;
                case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;
-               case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;
+               case 0x00000015: I_(NVKM_ENGINE_NVJPG , inst); break;
                default:
                        break;
                }