drm/nouveau/falcon: convert to new-style nvkm_engine

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 10 insertions, 41 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
index 0ee767373f79..47e2929bfaf0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
@@ -21,62 +21,31 @@
  *
  * Authors: Ben Skeggs, Maarten Lankhorst, Ilia Mirkin
  */
-#include <engine/msvld.h>
-#include <engine/falcon.h>
+#include "priv.h"
 
 #include <nvif/class.h>
 
-static int
-g98_msvld_init(struct nvkm_object *object)
+void
+g98_msvld_init(struct nvkm_falcon *msvld)
 {
-	struct nvkm_falcon *msvld = (void *)object;
 	struct nvkm_device *device = msvld->engine.subdev.device;
-	int ret;
-
-	ret = nvkm_falcon_init(msvld);
-	if (ret)
-		return ret;
-
 	nvkm_wr32(device, 0x084010, 0x0000ffd2);
 	nvkm_wr32(device, 0x08401c, 0x0000fff2);
-	return 0;
 }
 
 static const struct nvkm_falcon_func
-g98_msvld_func = {
+g98_msvld = {
+	.pmc_enable = 0x04008000,
+	.init = g98_msvld_init,
 	.sclass = {
 		{ -1, -1, G98_MSVLD },
-		{ -1, -1, GT212_MSVLD },
-		{ -1, -1, IGT21A_MSVLD },
 		{}
 	}
 };
 
-static int
-g98_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-	       struct nvkm_oclass *oclass, void *data, u32 size,
-	       struct nvkm_object **pobject)
+int
+g98_msvld_new(struct nvkm_device *device, int index,
+	      struct nvkm_engine **pengine)
 {
-	struct nvkm_falcon *msvld;
-	int ret;
-
-	ret = nvkm_falcon_create(&g98_msvld_func, parent, engine, oclass,
-				 0x084000, true, "PMSVLD", "msvld", &msvld);
-	*pobject = nv_object(msvld);
-	if (ret)
-		return ret;
-
-	nv_subdev(msvld)->unit = 0x04008000;
-	return 0;
+	return nvkm_msvld_new_(&g98_msvld, device, index, pengine);
 }
-
-struct nvkm_oclass
-g98_msvld_oclass = {
-	.handle = NV_ENGINE(MSVLD, 0x98),
-	.ofuncs = &(struct nvkm_ofuncs) {
-		.ctor = g98_msvld_ctor,
-		.dtor = _nvkm_falcon_dtor,
-		.init = g98_msvld_init,
-		.fini = _nvkm_falcon_fini,
-	},
-};