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 | 320ca25131758a445e351f701daf91d8aa5be096 (patch) | |
| tree | 724d179f203320f3451b07538c2f1bcba329ae6a | |
| parent | 54118c74fb4b4fdb032a6c4dfc59bb856bc6fc48 (diff) | |
drm/nouveau/msppp: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c index 04a4d52ff7ef..d681fe63b1bc 100644 --- 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 5e1fe3b1a196..7e61f092ef4a 100644 --- 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; } |