diff options
| author | Ben Skeggs | 2018-12-11 05:50:02 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2018-12-11 06:37:44 +0100 |
| commit | 936a1678f3f8b3c918185f0c5ba3a03ccedfb8d5 (patch) | |
| tree | e078569212b22d3da64818ca04443d72f2a8c8ae /drivers/gpu/drm/nouveau/include | |
| parent | drm/nouveau/drm/nouveau: Don't forget to label dp_aux devices (diff) | |
| download | kernel-qcow2-linux-936a1678f3f8b3c918185f0c5ba3a03ccedfb8d5.tar.gz kernel-qcow2-linux-936a1678f3f8b3c918185f0c5ba3a03ccedfb8d5.tar.xz kernel-qcow2-linux-936a1678f3f8b3c918185f0c5ba3a03ccedfb8d5.zip | |
drm/nouveau/core: support multiple nvdec instances
Turing GPUs can have more than one.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h index d83d834b7452..feb2215f1ca7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h @@ -61,7 +61,10 @@ enum nvkm_devidx { NVKM_ENGINE_NVENC2, NVKM_ENGINE_NVENC_LAST = NVKM_ENGINE_NVENC2, - NVKM_ENGINE_NVDEC, + NVKM_ENGINE_NVDEC0, + NVKM_ENGINE_NVDEC1, + NVKM_ENGINE_NVDEC_LAST = NVKM_ENGINE_NVDEC1, + NVKM_ENGINE_PM, NVKM_ENGINE_SEC, NVKM_ENGINE_SEC2, @@ -163,7 +166,7 @@ struct nvkm_device { struct nvkm_engine *msppp; struct nvkm_engine *msvld; struct nvkm_engine *nvenc[3]; - struct nvkm_nvdec *nvdec; + struct nvkm_nvdec *nvdec[2]; struct nvkm_pm *pm; struct nvkm_engine *sec; struct nvkm_sec2 *sec2; @@ -235,7 +238,7 @@ struct nvkm_device_chip { int (*msppp )(struct nvkm_device *, int idx, struct nvkm_engine **); int (*msvld )(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_nvdec **); + int (*nvdec[2])(struct nvkm_device *, int idx, struct nvkm_nvdec **); int (*pm )(struct nvkm_device *, int idx, struct nvkm_pm **); int (*sec )(struct nvkm_device *, int idx, struct nvkm_engine **); int (*sec2 )(struct nvkm_device *, int idx, struct nvkm_sec2 **); |