drm/nouveau/msppp: switch to device pri macros

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
index 04a4d52ff7efada17ebe80ad4042acf8e08b76a2..d681fe63b1bce5b009a62dfff9c04611562b6bb4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
@@ -60,14 +60,15 @@ static int
 g98_msppp_init(struct nvkm_object *object)
 {
        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;
 
-       nv_wr32(msppp, 0x086010, 0x0000ffd2);
-       nv_wr32(msppp, 0x08601c, 0x0000fff2);
+       nvkm_wr32(device, 0x086010, 0x0000ffd2);
+       nvkm_wr32(device, 0x08601c, 0x0000fff2);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
index 5e1fe3b1a196644d4dd96416776ef07d45ba8a9b..7e61f092ef4ab62bce317a47ebee72c348993917 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
@@ -59,14 +59,15 @@ static int
 gf100_msppp_init(struct nvkm_object *object)
 {
        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;
 
-       nv_wr32(msppp, 0x086010, 0x0000fff2);
-       nv_wr32(msppp, 0x08601c, 0x0000fff2);
+       nvkm_wr32(device, 0x086010, 0x0000fff2);
+       nvkm_wr32(device, 0x08601c, 0x0000fff2);
        return 0;
 }