drm/nouveau/falcon: switch to device pri macros
authorBen Skeggs <bskeggs@redhat.com>
Thu, 20 Aug 2015 04:54:09 +0000 (14:54 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 28 Aug 2015 02:40:16 +0000 (12:40 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/falcon.c

index 90175ab62e5429b39b5d7c552a6b26f4c1232c20..03ff19a68985e855b1889aea0964aa031738e5b8 100644 (file)
@@ -46,14 +46,14 @@ u32
 _nvkm_falcon_rd32(struct nvkm_object *object, u64 addr)
 {
        struct nvkm_falcon *falcon = (void *)object;
-       return nv_rd32(falcon, falcon->addr + addr);
+       return nvkm_rd32(falcon->engine.subdev.device, falcon->addr + addr);
 }
 
 void
 _nvkm_falcon_wr32(struct nvkm_object *object, u64 addr, u32 data)
 {
        struct nvkm_falcon *falcon = (void *)object;
-       nv_wr32(falcon, falcon->addr + addr, data);
+       nvkm_wr32(falcon->engine.subdev.device, falcon->addr + addr, data);
 }
 
 static void *