drm/nouveau/msvld: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
mariux64 · Aug 28, 2015 · f2d85ad · f2d85ad
1 parent 320ca25
commit f2d85ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
@@ -61,14 +61,15 @@ static int
 g98_msvld_init(struct nvkm_object *object)
 {
 	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;
 
-	nv_wr32(msvld, 0x084010, 0x0000ffd2);
-	nv_wr32(msvld, 0x08401c, 0x0000fff2);
+	nvkm_wr32(device, 0x084010, 0x0000ffd2);
+	nvkm_wr32(device, 0x08401c, 0x0000fff2);
 	return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
@@ -59,14 +59,15 @@ static int
 gf100_msvld_init(struct nvkm_object *object)
 {
 	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;
 
-	nv_wr32(msvld, 0x084010, 0x0000fff2);
-	nv_wr32(msvld, 0x08401c, 0x0000fff2);
+	nvkm_wr32(device, 0x084010, 0x0000fff2);
+	nvkm_wr32(device, 0x08401c, 0x0000fff2);
 	return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
@@ -59,14 +59,15 @@ static int
 gk104_msvld_init(struct nvkm_object *object)
 {
 	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;
 
-	nv_wr32(msvld, 0x084010, 0x0000fff2);
-	nv_wr32(msvld, 0x08401c, 0x0000fff2);
+	nvkm_wr32(device, 0x084010, 0x0000fff2);
+	nvkm_wr32(device, 0x08401c, 0x0000fff2);
 	return 0;
 }