Commit 29e9f510 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/ce: switch to device pri macros

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2ef770f7
...@@ -62,13 +62,14 @@ gk104_ce_cclass = { ...@@ -62,13 +62,14 @@ gk104_ce_cclass = {
static void static void
gk104_ce_intr(struct nvkm_subdev *subdev) gk104_ce_intr(struct nvkm_subdev *subdev)
{ {
struct nvkm_device *device = subdev->device;
const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0; const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;
struct nvkm_engine *ce = (void *)subdev; struct nvkm_engine *ce = (void *)subdev;
u32 stat = nv_rd32(ce, 0x104908 + (idx * 0x1000)); u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));
if (stat) { if (stat) {
nv_warn(ce, "unhandled intr 0x%08x\n", stat); nv_warn(ce, "unhandled intr 0x%08x\n", stat);
nv_wr32(ce, 0x104908 + (idx * 0x1000), stat); nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);
} }
} }
......
...@@ -62,13 +62,14 @@ gm204_ce_cclass = { ...@@ -62,13 +62,14 @@ gm204_ce_cclass = {
static void static void
gm204_ce_intr(struct nvkm_subdev *subdev) gm204_ce_intr(struct nvkm_subdev *subdev)
{ {
struct nvkm_device *device = subdev->device;
const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0; const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;
struct nvkm_engine *ce = (void *)subdev; struct nvkm_engine *ce = (void *)subdev;
u32 stat = nv_rd32(ce, 0x104908 + (idx * 0x1000)); u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));
if (stat) { if (stat) {
nv_warn(ce, "unhandled intr 0x%08x\n", stat); nv_warn(ce, "unhandled intr 0x%08x\n", stat);
nv_wr32(ce, 0x104908 + (idx * 0x1000), stat); nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment