drm/nouveau/bus: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c
index f6a55b8..69d55b4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c
@@ -29,14 +29,15 @@
static int
nv50_bus_hwsq_exec(struct nvkm_bus *bus, u32 *data, u32 size)
{
+ struct nvkm_device *device = bus->subdev.device;
int i;
- nv_mask(bus, 0x001098, 0x00000008, 0x00000000);
- nv_wr32(bus, 0x001304, 0x00000000);
+ nvkm_mask(device, 0x001098, 0x00000008, 0x00000000);
+ nvkm_wr32(device, 0x001304, 0x00000000);
for (i = 0; i < size; i++)
- nv_wr32(bus, 0x001400 + (i * 4), data[i]);
- nv_mask(bus, 0x001098, 0x00000018, 0x00000018);
- nv_wr32(bus, 0x00130c, 0x00000003);
+ nvkm_wr32(device, 0x001400 + (i * 4), data[i]);
+ nvkm_mask(device, 0x001098, 0x00000018, 0x00000018);
+ nvkm_wr32(device, 0x00130c, 0x00000003);
return nv_wait(bus, 0x001308, 0x00000100, 0x00000000) ? 0 : -ETIMEDOUT;
}
@@ -45,18 +46,19 @@
nv50_bus_intr(struct nvkm_subdev *subdev)
{
struct nvkm_bus *bus = nvkm_bus(subdev);
- u32 stat = nv_rd32(bus, 0x001100) & nv_rd32(bus, 0x001140);
+ struct nvkm_device *device = bus->subdev.device;
+ u32 stat = nvkm_rd32(device, 0x001100) & nvkm_rd32(device, 0x001140);
if (stat & 0x00000008) {
- u32 addr = nv_rd32(bus, 0x009084);
- u32 data = nv_rd32(bus, 0x009088);
+ u32 addr = nvkm_rd32(device, 0x009084);
+ u32 data = nvkm_rd32(device, 0x009088);
nv_error(bus, "MMIO %s of 0x%08x FAULT at 0x%06x\n",
(addr & 0x00000002) ? "write" : "read", data,
(addr & 0x00fffffc));
stat &= ~0x00000008;
- nv_wr32(bus, 0x001100, 0x00000008);
+ nvkm_wr32(device, 0x001100, 0x00000008);
}
if (stat & 0x00010000) {
@@ -64,12 +66,12 @@
if (subdev && subdev->intr)
subdev->intr(subdev);
stat &= ~0x00010000;
- nv_wr32(bus, 0x001100, 0x00010000);
+ nvkm_wr32(device, 0x001100, 0x00010000);
}
if (stat) {
nv_error(bus, "unknown intr 0x%08x\n", stat);
- nv_mask(bus, 0x001140, stat, 0);
+ nvkm_mask(device, 0x001140, stat, 0);
}
}
@@ -77,14 +79,15 @@
nv50_bus_init(struct nvkm_object *object)
{
struct nvkm_bus *bus = (void *)object;
+ struct nvkm_device *device = bus->subdev.device;
int ret;
ret = nvkm_bus_init(bus);
if (ret)
return ret;
- nv_wr32(bus, 0x001100, 0xffffffff);
- nv_wr32(bus, 0x001140, 0x00010008);
+ nvkm_wr32(device, 0x001100, 0xffffffff);
+ nvkm_wr32(device, 0x001140, 0x00010008);
return 0;
}