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 1abf22f87c71026fdabb773c61ca8c754115f699..2237a44a537061ab0fc703f4ecaed8d1a7dc6d44 100644 (file)
--- 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 3fd896a92978dc93c0615d1ccafa305f024112cd..698deddd51f5f97de7f02b6f460e1f65fee130c8 100644 (file)
--- 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);
        }
 }