falcon: convert to new-style nvkm_engine

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

6 files changed, 105 insertions, 79 deletions

diff --git a/drm/nouveau/nvkm/engine/msppp/Kbuild b/drm/nouveau/nvkm/engine/msppp/Kbuild
index 4576a9eee..3ea7eafb4 100644
--- a/drm/nouveau/nvkm/engine/msppp/Kbuild
+++ b/drm/nouveau/nvkm/engine/msppp/Kbuild
@@ -1,2 +1,4 @@
+nvkm-y += nvkm/engine/msppp/base.o
 nvkm-y += nvkm/engine/msppp/g98.o
+nvkm-y += nvkm/engine/msppp/gt215.o
 nvkm-y += nvkm/engine/msppp/gf100.o
diff --git a/drm/nouveau/nvkm/engine/msppp/base.c b/drm/nouveau/nvkm/engine/msppp/base.c
new file mode 100644
index 000000000..bfae5e60e
--- /dev/null
+++ b/drm/nouveau/nvkm/engine/msppp/base.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs <bskeggs@redhat.com>
+ */
+#include "priv.h"
+
+int
+nvkm_msppp_new_(const struct nvkm_falcon_func *func, struct nvkm_device *device,
+		int index, struct nvkm_engine **pengine)
+{
+	return nvkm_falcon_new_(func, device, index, true, 0x086000, pengine);
+}
diff --git a/drm/nouveau/nvkm/engine/msppp/g98.c b/drm/nouveau/nvkm/engine/msppp/g98.c
index 314736d6a..73f633ae2 100644
--- a/drm/nouveau/nvkm/engine/msppp/g98.c
+++ b/drm/nouveau/nvkm/engine/msppp/g98.c
@@ -21,61 +21,31 @@
  *
  * Authors: Ben Skeggs, Maarten Lankhorst, Ilia Mirkin
  */
-#include <engine/msppp.h>
-#include <engine/falcon.h>
+#include "priv.h"
 
 #include <nvif/class.h>
 
-static int
-g98_msppp_init(struct nvkm_object *object)
+void
+g98_msppp_init(struct nvkm_falcon *msppp)
 {
-	struct nvkm_falcon *msppp = (void *)object;
 	struct nvkm_device *device = msppp->engine.subdev.device;
-	int ret;
-
-	ret = nvkm_falcon_init(msppp);
-	if (ret)
-		return ret;
-
 	nvkm_wr32(device, 0x086010, 0x0000ffd2);
 	nvkm_wr32(device, 0x08601c, 0x0000fff2);
-	return 0;
 }
 
 static const struct nvkm_falcon_func
-g98_msppp_func = {
+g98_msppp = {
+	.pmc_enable = 0x00400002,
+	.init = g98_msppp_init,
 	.sclass = {
 		{ -1, -1, G98_MSPPP },
-		{ -1, -1, GT212_MSPPP },
 		{}
 	}
 };
 
-static int
-g98_msppp_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-	       struct nvkm_oclass *oclass, void *data, u32 size,
-	       struct nvkm_object **pobject)
+int
+g98_msppp_new(struct nvkm_device *device, int index,
+	      struct nvkm_engine **pengine)
 {
-	struct nvkm_falcon *msppp;
-	int ret;
-
-	ret = nvkm_falcon_create(&g98_msppp_func, parent, engine, oclass,
-				 0x086000, true, "PMSPPP", "msppp", &msppp);
-	*pobject = nv_object(msppp);
-	if (ret)
-		return ret;
-
-	nv_subdev(msppp)->unit = 0x00400002;
-	return 0;
+	return nvkm_msppp_new_(&g98_msppp, device, index, pengine);
 }
-
-struct nvkm_oclass
-g98_msppp_oclass = {
-	.handle = NV_ENGINE(MSPPP, 0x98),
-	.ofuncs = &(struct nvkm_ofuncs) {
-		.ctor = g98_msppp_ctor,
-		.dtor = _nvkm_falcon_dtor,
-		.init = g98_msppp_init,
-		.fini = _nvkm_falcon_fini,
-	},
-};
diff --git a/drm/nouveau/nvkm/engine/msppp/gf100.c b/drm/nouveau/nvkm/engine/msppp/gf100.c
index f977c2adf..c42c0c07e 100644
--- a/drm/nouveau/nvkm/engine/msppp/gf100.c
+++ b/drm/nouveau/nvkm/engine/msppp/gf100.c
@@ -21,60 +21,31 @@
  *
  * Authors: Maarten Lankhorst
  */
-#include <engine/msppp.h>
-#include <engine/falcon.h>
+#include "priv.h"
 
 #include <nvif/class.h>
 
-static int
-gf100_msppp_init(struct nvkm_object *object)
+static void
+gf100_msppp_init(struct nvkm_falcon *msppp)
 {
-	struct nvkm_falcon *msppp = (void *)object;
 	struct nvkm_device *device = msppp->engine.subdev.device;
-	int ret;
-
-	ret = nvkm_falcon_init(msppp);
-	if (ret)
-		return ret;
-
 	nvkm_wr32(device, 0x086010, 0x0000fff2);
 	nvkm_wr32(device, 0x08601c, 0x0000fff2);
-	return 0;
 }
 
 static const struct nvkm_falcon_func
-gf100_msppp_func = {
+gf100_msppp = {
+	.pmc_enable = 0x00000002,
+	.init = gf100_msppp_init,
 	.sclass = {
 		{ -1, -1, GF100_MSPPP },
 		{}
 	}
 };
 
-static int
-gf100_msppp_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-		 struct nvkm_oclass *oclass, void *data, u32 size,
-		 struct nvkm_object **pobject)
+int
+gf100_msppp_new(struct nvkm_device *device, int index,
+		struct nvkm_engine **pengine)
 {
-	struct nvkm_falcon *msppp;
-	int ret;
-
-	ret = nvkm_falcon_create(&gf100_msppp_func, parent, engine, oclass,
-				 0x086000, true, "PMSPPP", "msppp", &msppp);
-	*pobject = nv_object(msppp);
-	if (ret)
-		return ret;
-
-	nv_subdev(msppp)->unit = 0x00000002;
-	return 0;
+	return nvkm_msppp_new_(&gf100_msppp, device, index, pengine);
 }
-
-struct nvkm_oclass
-gf100_msppp_oclass = {
-	.handle = NV_ENGINE(MSPPP, 0xc0),
-	.ofuncs = &(struct nvkm_ofuncs) {
-		.ctor = gf100_msppp_ctor,
-		.dtor = _nvkm_falcon_dtor,
-		.init = gf100_msppp_init,
-		.fini = _nvkm_falcon_fini,
-	},
-};
diff --git a/drm/nouveau/nvkm/engine/msppp/gt215.c b/drm/nouveau/nvkm/engine/msppp/gt215.c
new file mode 100644
index 000000000..00e7795f1
--- /dev/null
+++ b/drm/nouveau/nvkm/engine/msppp/gt215.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs, Maarten Lankhorst, Ilia Mirkin
+ */
+#include "priv.h"
+
+#include <nvif/class.h>
+
+static const struct nvkm_falcon_func
+gt215_msppp = {
+	.pmc_enable = 0x00400002,
+	.init = g98_msppp_init,
+	.sclass = {
+		{ -1, -1, GT212_MSPPP },
+		{}
+	}
+};
+
+int
+gt215_msppp_new(struct nvkm_device *device, int index,
+	      struct nvkm_engine **pengine)
+{
+	return nvkm_msppp_new_(&gt215_msppp, device, index, pengine);
+}
diff --git a/drm/nouveau/nvkm/engine/msppp/priv.h b/drm/nouveau/nvkm/engine/msppp/priv.h
new file mode 100644
index 000000000..37a91f9d9
--- /dev/null
+++ b/drm/nouveau/nvkm/engine/msppp/priv.h
@@ -0,0 +1,9 @@
+#ifndef __NVKM_MSPPP_PRIV_H__
+#define __NVKM_MSPPP_PRIV_H__
+#include <engine/msppp.h>
+
+int nvkm_msppp_new_(const struct nvkm_falcon_func *, struct nvkm_device *,
+		    int index, struct nvkm_engine **);
+
+void g98_msppp_init(struct nvkm_falcon *);
+#endif