Commit 34bf50cd authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core: increase maximum ce instances to 6 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c73baa83

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+6 −3
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ enum nvkm_devidx { 
	NVKM_ENGINE_CE0,

	NVKM_ENGINE_CE1,

	NVKM_ENGINE_CE2,

	NVKM_ENGINE_CE_LAST = NVKM_ENGINE_CE2,

	NVKM_ENGINE_CE3,

	NVKM_ENGINE_CE4,

	NVKM_ENGINE_CE5,

	NVKM_ENGINE_CE_LAST = NVKM_ENGINE_CE5,



	NVKM_ENGINE_CIPHER,

	NVKM_ENGINE_DISP,
@@ -136,7 +139,7 @@ struct nvkm_device { 
	struct nvkm_volt *volt;



	struct nvkm_engine *bsp;

	struct nvkm_engine *ce[3];

	struct nvkm_engine *ce[6];

	struct nvkm_engine *cipher;

	struct nvkm_disp *disp;

	struct nvkm_dma *dma;
@@ -206,7 +209,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[3]   )(struct nvkm_device *, int idx, struct nvkm_engine **);

	int (*ce[6]   )(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 **);

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = { 
	[NVKM_ENGINE_CE0     ] = "ce0",

	[NVKM_ENGINE_CE1     ] = "ce1",

	[NVKM_ENGINE_CE2     ] = "ce2",

	[NVKM_ENGINE_CE3     ] = "ce3",

	[NVKM_ENGINE_CE4     ] = "ce4",

	[NVKM_ENGINE_CE5     ] = "ce5",

	[NVKM_ENGINE_CIPHER  ] = "cipher",

	[NVKM_ENGINE_DISP    ] = "disp",

	[NVKM_ENGINE_DMAOBJ  ] = "dma",

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+6 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,9 @@ nvkm_device_engine(struct nvkm_device *device, int index) 
	_(CE0    , device->ce[0]   ,  device->ce[0]);

	_(CE1    , device->ce[1]   ,  device->ce[1]);

	_(CE2    , device->ce[2]   ,  device->ce[2]);

	_(CE3    , device->ce[3]   ,  device->ce[3]);

	_(CE4    , device->ce[4]   ,  device->ce[4]);

	_(CE5    , device->ce[5]   ,  device->ce[5]);

	_(CIPHER , device->cipher  ,  device->cipher);

	_(DISP   , device->disp    , &device->disp->engine);

	_(DMAOBJ , device->dma     , &device->dma->engine);
@@ -2659,6 +2662,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
		_(NVKM_ENGINE_CE0     ,    ce[0]);

		_(NVKM_ENGINE_CE1     ,    ce[1]);

		_(NVKM_ENGINE_CE2     ,    ce[2]);

		_(NVKM_ENGINE_CE3     ,    ce[3]);

		_(NVKM_ENGINE_CE4     ,    ce[4]);

		_(NVKM_ENGINE_CE5     ,    ce[5]);

		_(NVKM_ENGINE_CIPHER  ,   cipher);

		_(NVKM_ENGINE_DISP    ,     disp);

		_(NVKM_ENGINE_DMAOBJ  ,      dma);