From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 20 Aug 2015 04:54:10 +0000 (+1000)
Subject: drm/nouveau/device: switch to device pri macros
X-Git-Tag: Ubuntu-5.10.0-12.13~14153^2~11^2~190
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f9793bb7ed4d83c1b72661c1cca2949a343df231;p=mirror_ubuntu-hirsute-kernel.git

drm/nouveau/device: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

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