drm/nouveau/mspdec: switch to device pri macros

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
index 55ffb3f..f83d020 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
+++ b/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;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
index 7c5d01d..9bbeede 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
+++ b/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;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
index 6075518..fb742b4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
+++ b/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;
 }