drm/nouveau/msvld: switch to device pri macros

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
index 055bc2141f6bc89851499adbb8be8642e8e99f72..c7d981cad8226f8853375888056aa18ab7af6d21 100644 (file)
--- 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
index 0730198daea79b1d6368f4f43310d147af4fc9a7..156ebcf22a27f296ba48e1efc776184f8e7d766a 100644 (file)
--- 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
index e19ebfdaae6a3b3278155dcefe68b23487140c91..870e61465b07fe785f8e25711afe3d7f5920d944 100644 (file)
--- 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;
 }