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 | 54118c74fb4b4fdb032a6c4dfc59bb856bc6fc48 (patch) | |
| tree | eea431ca5b9e387d9f4def37909650bb5da00909 | |
| parent | 636e37aa978b4904189710b5b501299bd7404ad5 (diff) | |
drm/nouveau/mspdec: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c index 55ffb3f1f36c..f83d020f05de 100644 --- 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 7c5d01dcf92e..9bbeede03e06 100644 --- 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 60755185e88e..fb742b442ce9 100644 --- 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; } |