drm/nouveau/core: increase maximum number of copy engines to 9

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index f2f9b9e7ce2ea956441aa7ec7b2b6b5bdab5336d..08c52e3afc0309fde99446b6ec221e86dccb9718 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -38,7 +38,10 @@ enum nvkm_devidx {
        NVKM_ENGINE_CE3,
        NVKM_ENGINE_CE4,
        NVKM_ENGINE_CE5,
-       NVKM_ENGINE_CE_LAST = NVKM_ENGINE_CE5,
+       NVKM_ENGINE_CE6,
+       NVKM_ENGINE_CE7,
+       NVKM_ENGINE_CE8,
+       NVKM_ENGINE_CE_LAST = NVKM_ENGINE_CE8,
 
        NVKM_ENGINE_CIPHER,
        NVKM_ENGINE_DISP,
@@ -145,7 +148,7 @@ struct nvkm_device {
        struct nvkm_volt *volt;
 
        struct nvkm_engine *bsp;
-       struct nvkm_engine *ce[6];
+       struct nvkm_engine *ce[9];
        struct nvkm_engine *cipher;
        struct nvkm_disp *disp;
        struct nvkm_dma *dma;
@@ -217,7 +220,7 @@ struct nvkm_device_chip {
        int (*volt    )(struct nvkm_device *, int idx, struct nvkm_volt **);
 
        int (*bsp     )(struct nvkm_device *, int idx, struct nvkm_engine **);
-       int (*ce[6]   )(struct nvkm_device *, int idx, struct nvkm_engine **);
+       int (*ce[9]   )(struct nvkm_device *, int idx, struct nvkm_engine **);
        int (*cipher  )(struct nvkm_device *, int idx, struct nvkm_engine **);
        int (*disp    )(struct nvkm_device *, int idx, struct nvkm_disp **);
        int (*dma     )(struct nvkm_device *, int idx, struct nvkm_dma **);

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
index b96f9e2f237a2cab0e60ffe2ebab0e8f2d12bb51..03f676c18aad5240e654739d6092a62ca5f74e4f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
@@ -61,6 +61,9 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = {
        [NVKM_ENGINE_CE3     ] = "ce3",
        [NVKM_ENGINE_CE4     ] = "ce4",
        [NVKM_ENGINE_CE5     ] = "ce5",
+       [NVKM_ENGINE_CE6     ] = "ce6",
+       [NVKM_ENGINE_CE7     ] = "ce7",
+       [NVKM_ENGINE_CE8     ] = "ce8",
        [NVKM_ENGINE_CIPHER  ] = "cipher",
        [NVKM_ENGINE_DISP    ] = "disp",
        [NVKM_ENGINE_DMAOBJ  ] = "dma",

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5c79c795acaa577cad62ad2e7a90b7f56b032a3f..b9b6bef3b805e1f539e2d972fcef8fb8720909de 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2471,6 +2471,9 @@ nvkm_device_engine(struct nvkm_device *device, int index)
        _(CE3    , device->ce[3]   ,  device->ce[3]);
        _(CE4    , device->ce[4]   ,  device->ce[4]);
        _(CE5    , device->ce[5]   ,  device->ce[5]);
+       _(CE6    , device->ce[6]   ,  device->ce[6]);
+       _(CE7    , device->ce[7]   ,  device->ce[7]);
+       _(CE8    , device->ce[8]   ,  device->ce[8]);
        _(CIPHER , device->cipher  ,  device->cipher);
        _(DISP   , device->disp    , &device->disp->engine);
        _(DMAOBJ , device->dma     , &device->dma->engine);
@@ -2925,6 +2928,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
                _(NVKM_ENGINE_CE3     ,    ce[3]);
                _(NVKM_ENGINE_CE4     ,    ce[4]);
                _(NVKM_ENGINE_CE5     ,    ce[5]);
+               _(NVKM_ENGINE_CE6     ,    ce[6]);
+               _(NVKM_ENGINE_CE7     ,    ce[7]);
+               _(NVKM_ENGINE_CE8     ,    ce[8]);
                _(NVKM_ENGINE_CIPHER  ,   cipher);
                _(NVKM_ENGINE_DISP    ,     disp);
                _(NVKM_ENGINE_DMAOBJ  ,      dma);