drm/nouveau/core: increase maximum nvenc instances to 3 (cb7b5ea9) · Commits · 戴 / test

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,8 @@ enum nvkm_devidx {

		NVKM_ENGINE_NVENC0,
		NVKM_ENGINE_NVENC1,
		NVKM_ENGINE_NVENC_LAST = NVKM_ENGINE_NVENC1,
		NVKM_ENGINE_NVENC2,
		NVKM_ENGINE_NVENC_LAST = NVKM_ENGINE_NVENC2,

		NVKM_ENGINE_NVDEC,
		NVKM_ENGINE_PM,
		@@ -152,7 +153,7 @@ struct nvkm_device {
		struct nvkm_engine *mspdec;
		struct nvkm_engine *msppp;
		struct nvkm_engine *msvld;
		struct nvkm_engine *nvenc[2];
		struct nvkm_engine *nvenc[3];
		struct nvkm_engine *nvdec;
		struct nvkm_pm *pm;
		struct nvkm_engine *sec;
		@@ -222,7 +223,7 @@ struct nvkm_device_chip {
		int (mspdec )(struct nvkm_device , int idx, struct nvkm_engine **);
		int (msppp )(struct nvkm_device , int idx, struct nvkm_engine **);
		int (msvld )(struct nvkm_device , int idx, struct nvkm_engine **);
		int (nvenc[2])(struct nvkm_device , int idx, struct nvkm_engine **);
		int (nvenc[3])(struct nvkm_device , int idx, struct nvkm_engine **);
		int (nvdec )(struct nvkm_device , int idx, struct nvkm_engine **);
		int (pm )(struct nvkm_device , int idx, struct nvkm_pm **);
		int (sec )(struct nvkm_device , int idx, struct nvkm_engine **);

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = {
		[NVKM_ENGINE_MSVLD ] = "msvld",
		[NVKM_ENGINE_NVENC0 ] = "nvenc0",
		[NVKM_ENGINE_NVENC1 ] = "nvenc1",
		[NVKM_ENGINE_NVENC2 ] = "nvenc2",
		[NVKM_ENGINE_NVDEC ] = "nvdec",
		[NVKM_ENGINE_PM ] = "pm",
		[NVKM_ENGINE_SEC ] = "sec",

+2 −0

Original line number	Diff line number	Diff line
		@@ -2238,6 +2238,7 @@ nvkm_device_engine(struct nvkm_device *device, int index)
		_(MSVLD , device->msvld , device->msvld);
		_(NVENC0 , device->nvenc[0], device->nvenc[0]);
		_(NVENC1 , device->nvenc[1], device->nvenc[1]);
		_(NVENC2 , device->nvenc[2], device->nvenc[2]);
		_(NVDEC , device->nvdec , device->nvdec);
		_(PM , device->pm , &device->pm->engine);
		_(SEC , device->sec , device->sec);
		@@ -2679,6 +2680,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
		_(NVKM_ENGINE_MSVLD , msvld);
		_(NVKM_ENGINE_NVENC0 , nvenc[0]);
		_(NVKM_ENGINE_NVENC1 , nvenc[1]);
		_(NVKM_ENGINE_NVENC2 , nvenc[2]);
		_(NVKM_ENGINE_NVDEC , nvdec);
		_(NVKM_ENGINE_PM , pm);
		_(NVKM_ENGINE_SEC , sec);