From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 20 Aug 2015 04:54:09 +0000 (+1000)
Subject: drm/nouveau/ce: switch to device pri macros
X-Git-Tag: firefly_0821_release~176^2~1083^2^2~195
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29e9f51094316879c4602795167e9635e18a3c8b;p=firefly-linux-kernel-4.4.55.git

drm/nouveau/ce: switch to device pri macros

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
index 1abf22f87c71..2237a44a5370 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
@@ -62,13 +62,14 @@ gk104_ce_cclass = {
 static void
 gk104_ce_intr(struct nvkm_subdev *subdev)
 {
+	struct nvkm_device *device = subdev->device;
 	const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;
 	struct nvkm_engine *ce = (void *)subdev;
-	u32 stat = nv_rd32(ce, 0x104908 + (idx * 0x1000));
+	u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));
 
 	if (stat) {
 		nv_warn(ce, "unhandled intr 0x%08x\n", stat);
-		nv_wr32(ce, 0x104908 + (idx * 0x1000), stat);
+		nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);
 	}
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
index 3fd896a92978..698deddd51f5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
@@ -62,13 +62,14 @@ gm204_ce_cclass = {
 static void
 gm204_ce_intr(struct nvkm_subdev *subdev)
 {
+	struct nvkm_device *device = subdev->device;
 	const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;
 	struct nvkm_engine *ce = (void *)subdev;
-	u32 stat = nv_rd32(ce, 0x104908 + (idx * 0x1000));
+	u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));
 
 	if (stat) {
 		nv_warn(ce, "unhandled intr 0x%08x\n", stat);
-		nv_wr32(ce, 0x104908 + (idx * 0x1000), stat);
+		nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);
 	}
 }