diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2021-02-04 08:30:30 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2021-02-11 11:49:56 +1000 |
| commit | 50551b15c760b3da8ad6284d0518013d1b4f437f (patch) | |
| tree | a024c0d5d44ccb20a68f93a761699fa2140bd3e9 /drivers/gpu/drm/nouveau/nvkm/core | |
| parent | b7da823a3e2ff91a8853b31d53afba437cc34508 (diff) | |
| download | lwn-50551b15c760b3da8ad6284d0518013d1b4f437f.tar.gz lwn-50551b15c760b3da8ad6284d0518013d1b4f437f.zip | |
drm/nouveau/ce: switch to instanced constructor
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/core')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/engine.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/engine.c b/drivers/gpu/drm/nouveau/nvkm/core/engine.c index ca99cb218516..293b6c3f24d6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/engine.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/engine.c @@ -194,11 +194,11 @@ nvkm_engine_ctor_(const struct nvkm_engine_func *func, bool old, struct nvkm_dev } int -nvkm_engine_new_(const struct nvkm_engine_func *func, - struct nvkm_device *device, int index, bool enable, +nvkm_engine_new__(const struct nvkm_engine_func *func, bool old, struct nvkm_device *device, + enum nvkm_subdev_type type, int inst, bool enable, struct nvkm_engine **pengine) { if (!(*pengine = kzalloc(sizeof(**pengine), GFP_KERNEL))) return -ENOMEM; - return nvkm_engine_ctor(func, device, index, enable, *pengine); + return nvkm_engine_ctor_(func, old, device, type, inst, enable, *pengine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c index d81d1f716de3..c0129aca8e72 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c @@ -33,15 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { #include <core/layout.h> #undef NVKM_LAYOUT_ONCE #undef NVKM_LAYOUT_INST - [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_CE6 ] = "ce6", - [NVKM_ENGINE_CE7 ] = "ce7", - [NVKM_ENGINE_CE8 ] = "ce8", [NVKM_ENGINE_CIPHER ] = "cipher", [NVKM_ENGINE_DISP ] = "disp", [NVKM_ENGINE_DMAOBJ ] = "dma", @@ -211,10 +202,6 @@ nvkm_subdev_ctor_(const struct nvkm_subdev_func *func, bool old, if (old) { switch (subdev->type) { - case NVKM_ENGINE_CE0 ... NVKM_ENGINE_CE_LAST: - subdev->type = NVKM_ENGINE_CE; - subdev->inst = subdev->index - NVKM_ENGINE_CE0; - break; case NVKM_ENGINE_NVENC0 ... NVKM_ENGINE_NVENC_LAST: subdev->type = NVKM_ENGINE_NVENC; subdev->inst = subdev->index - NVKM_ENGINE_NVENC0; |