diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:09 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:17 +1000 |
| commit | 29e9f51094316879c4602795167e9635e18a3c8b (patch) | |
| tree | e7166c39613c081ee49766adda0c3c53cba1ece7 /drivers/gpu/drm/nouveau/nvkm/engine/ce | |
| parent | drm/nouveau/xtensa: switch to device pri macros (diff) | |
| download | linux-dev-29e9f51094316879c4602795167e9635e18a3c8b.tar.xz linux-dev-29e9f51094316879c4602795167e9635e18a3c8b.zip | |
drm/nouveau/ce: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/ce')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c | 5 |
2 files changed, 6 insertions, 4 deletions
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); } } |