Răsfoiți Sursa

drm/nouveau/mspdec: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 10 ani în urmă
părinte
comite
54118c74fb

+ 3 - 2
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c

@@ -60,14 +60,15 @@ static int
 g98_mspdec_init(struct nvkm_object *object)
 {
 	struct nvkm_falcon *mspdec = (void *)object;
+	struct nvkm_device *device = mspdec->engine.subdev.device;
 	int ret;
 
 	ret = nvkm_falcon_init(mspdec);
 	if (ret)
 		return ret;
 
-	nv_wr32(mspdec, 0x085010, 0x0000ffd2);
-	nv_wr32(mspdec, 0x08501c, 0x0000fff2);
+	nvkm_wr32(device, 0x085010, 0x0000ffd2);
+	nvkm_wr32(device, 0x08501c, 0x0000fff2);
 	return 0;
 }
 

+ 3 - 2
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c

@@ -59,14 +59,15 @@ static int
 gf100_mspdec_init(struct nvkm_object *object)
 {
 	struct nvkm_falcon *mspdec = (void *)object;
+	struct nvkm_device *device = mspdec->engine.subdev.device;
 	int ret;
 
 	ret = nvkm_falcon_init(mspdec);
 	if (ret)
 		return ret;
 
-	nv_wr32(mspdec, 0x085010, 0x0000fff2);
-	nv_wr32(mspdec, 0x08501c, 0x0000fff2);
+	nvkm_wr32(device, 0x085010, 0x0000fff2);
+	nvkm_wr32(device, 0x08501c, 0x0000fff2);
 	return 0;
 }
 

+ 5 - 4
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c

@@ -58,15 +58,16 @@ gk104_mspdec_cclass = {
 static int
 gk104_mspdec_init(struct nvkm_object *object)
 {
-	struct nvkm_falcon *falcon = (void *)object;
+	struct nvkm_falcon *mspdec = (void *)object;
+	struct nvkm_device *device = mspdec->engine.subdev.device;
 	int ret;
 
-	ret = nvkm_falcon_init(falcon);
+	ret = nvkm_falcon_init(mspdec);
 	if (ret)
 		return ret;
 
-	nv_wr32(falcon, 0x085010, 0x0000fff2);
-	nv_wr32(falcon, 0x08501c, 0x0000fff2);
+	nvkm_wr32(device, 0x085010, 0x0000fff2);
+	nvkm_wr32(device, 0x08501c, 0x0000fff2);
 	return 0;
 }