From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 20 Aug 2015 04:54:10 +0000 (+1000)
Subject: drm/nouveau/msppp: switch to device pri macros
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=320ca25131758a445e351f701daf91d8aa5be096;p=linux-beck.git

drm/nouveau/msppp: switch to device pri macros

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

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;
 }