summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c5
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c5
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;
}