diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-12-04 16:13:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2021-02-11 11:50:00 +1000 |
| commit | 8d6461d832df2544664eb0979cc849318e78cd0e (patch) | |
| tree | 7b7dad612be2af249d3d64d8594ab673bfca44cc /drivers/gpu/drm/nouveau/nvkm/core | |
| parent | d1866250a22278859e1ec952ff62d2044ee37533 (diff) | |
| download | linux-8d6461d832df2544664eb0979cc849318e78cd0e.tar.gz | |
drm/nouveau/sw: 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 | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/engine.c b/drivers/gpu/drm/nouveau/nvkm/core/engine.c index bb5440b0a602..e41a39ae1597 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/engine.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/engine.c @@ -176,10 +176,10 @@ nvkm_engine = { }; int -nvkm_engine_ctor_(const struct nvkm_engine_func *func, bool old, struct nvkm_device *device, - enum nvkm_subdev_type type, int inst, bool enable, struct nvkm_engine *engine) +nvkm_engine_ctor(const struct nvkm_engine_func *func, struct nvkm_device *device, + enum nvkm_subdev_type type, int inst, bool enable, struct nvkm_engine *engine) { - nvkm_subdev_ctor_(&nvkm_engine, old, device, type, inst, &engine->subdev); + nvkm_subdev_ctor(&nvkm_engine, device, type, inst, &engine->subdev); engine->func = func; refcount_set(&engine->use.refcount, 0); mutex_init(&engine->use.mutex); diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c index aa6a93ba32dd..e97dbc26dc15 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c @@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { #include <core/layout.h> #undef NVKM_LAYOUT_ONCE #undef NVKM_LAYOUT_INST - [NVKM_ENGINE_SW ] = "sw", [NVKM_ENGINE_VIC ] = "vic", }; @@ -169,9 +168,8 @@ nvkm_subdev_disable(struct nvkm_device *device, enum nvkm_subdev_type type, int } void -nvkm_subdev_ctor_(const struct nvkm_subdev_func *func, bool old, - struct nvkm_device *device, enum nvkm_subdev_type type, int inst, - struct nvkm_subdev *subdev) +nvkm_subdev_ctor(const struct nvkm_subdev_func *func, struct nvkm_device *device, + enum nvkm_subdev_type type, int inst, struct nvkm_subdev *subdev) { subdev->func = func; subdev->device = device; |