X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Fgpu%2Fdrm%2Fnouveau%2Fnvkm%2Fengine%2Fmsvld%2Fg98.c;h=cdb7de5a73054d5b21117e5b3b9ecee256bb2ad3;hb=a83d8872fc8a482e47f7375ab66006e1f8c1fd59;hp=c8a6b4ef52a1a2170273317362a61328bf6e0205;hpb=8f711a601d6a2f61bb0ca173911bedc5069d3b9a;p=uclinux-h8%2Flinux.git

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
index c8a6b4ef52a1..cdb7de5a7305 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
@@ -24,10 +24,6 @@
 #include <engine/msvld.h>
 #include <engine/falcon.h>
 
-struct g98_msvld_priv {
-	struct nvkm_falcon base;
-};
-
 /*******************************************************************************
  * MSVLD object classes
  ******************************************************************************/
@@ -64,35 +60,40 @@ g98_msvld_cclass = {
 static int
 g98_msvld_init(struct nvkm_object *object)
 {
-	struct g98_msvld_priv *priv = (void *)object;
+	struct nvkm_falcon *msvld = (void *)object;
+	struct nvkm_device *device = msvld->engine.subdev.device;
 	int ret;
 
-	ret = nvkm_falcon_init(&priv->base);
+	ret = nvkm_falcon_init(msvld);
 	if (ret)
 		return ret;
 
-	nv_wr32(priv, 0x084010, 0x0000ffd2);
-	nv_wr32(priv, 0x08401c, 0x0000fff2);
+	nvkm_wr32(device, 0x084010, 0x0000ffd2);
+	nvkm_wr32(device, 0x08401c, 0x0000fff2);
 	return 0;
 }
 
+static const struct nvkm_falcon_func
+g98_msvld_func = {
+};
+
 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)
 {
-	struct g98_msvld_priv *priv;
+	struct nvkm_falcon *msvld;
 	int ret;
 
-	ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true,
-				 "PMSVLD", "msvld", &priv);
-	*pobject = nv_object(priv);
+	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(priv)->unit = 0x04008000;
-	nv_engine(priv)->cclass = &g98_msvld_cclass;
-	nv_engine(priv)->sclass = g98_msvld_sclass;
+	nv_subdev(msvld)->unit = 0x04008000;
+	nv_engine(msvld)->cclass = &g98_msvld_cclass;
+	nv_engine(msvld)->sclass = g98_msvld_sclass;
 	return 0;
 }
 
@@ -104,7 +105,5 @@ g98_msvld_oclass = {
 		.dtor = _nvkm_falcon_dtor,
 		.init = g98_msvld_init,
 		.fini = _nvkm_falcon_fini,
-		.rd32 = _nvkm_falcon_rd32,
-		.wr32 = _nvkm_falcon_wr32,
 	},
 };