diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:18 +1000 |
| commit | f2d85ad1a63130ba31434d042b6c76f24f6b9673 (patch) | |
| tree | 1dd0503606b03a5ac7b2e702e70c7d6aec3b3921 | |
| parent | drm/nouveau/msppp: switch to device pri macros (diff) | |
| download | linux-dev-f2d85ad1a63130ba31434d042b6c76f24f6b9673.tar.xz linux-dev-f2d85ad1a63130ba31434d042b6c76f24f6b9673.zip | |
drm/nouveau/msvld: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c index 055bc2141f6b..c7d981cad822 100644 --- 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 0730198daea7..156ebcf22a27 100644 --- 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 e19ebfdaae6a..870e61465b07 100644 --- 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; } |