aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:10 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:17 +1000
commitf9793bb7ed4d83c1b72661c1cca2949a343df231 (patch)
treefd9cc46ad73187b7c131ef61d625d002e5e3de11
parentb958bf916d34f35639048361f7d87334770ebf4d (diff)
downloadlinux-f9793bb7ed4d83c1b72661c1cca2949a343df231.tar.gz
drm/nouveau/device: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 106ec87749a4..35047437cf4c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -164,37 +164,37 @@ nvkm_devobj_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
static u8
nvkm_devobj_rd08(struct nvkm_object *object, u64 addr)
{
- return nv_rd08(object->engine, addr);
+ return nvkm_rd08(object->engine->subdev.device, addr);
}
static u16
nvkm_devobj_rd16(struct nvkm_object *object, u64 addr)
{
- return nv_rd16(object->engine, addr);
+ return nvkm_rd16(object->engine->subdev.device, addr);
}
static u32
nvkm_devobj_rd32(struct nvkm_object *object, u64 addr)
{
- return nv_rd32(object->engine, addr);
+ return nvkm_rd32(object->engine->subdev.device, addr);
}
static void
nvkm_devobj_wr08(struct nvkm_object *object, u64 addr, u8 data)
{
- nv_wr08(object->engine, addr, data);
+ nvkm_wr08(object->engine->subdev.device, addr, data);
}
static void
nvkm_devobj_wr16(struct nvkm_object *object, u64 addr, u16 data)
{
- nv_wr16(object->engine, addr, data);
+ nvkm_wr16(object->engine->subdev.device, addr, data);
}
static void
nvkm_devobj_wr32(struct nvkm_object *object, u64 addr, u32 data)
{
- nv_wr32(object->engine, addr, data);
+ nvkm_wr32(object->engine->subdev.device, addr, data);
}
static int