From: Ben Skeggs Date: Thu, 20 Aug 2015 04:54:09 +0000 (+1000) Subject: drm/nouveau/falcon: switch to device pri macros X-Git-Tag: android-x86-6.0-r1~719^2^2~197 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96975248ee45cd50101b4bdf0eaf8c2d9e6cfa73;p=android-x86%2Fkernel.git drm/nouveau/falcon: switch to device pri macros Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c index 90175ab62e54..03ff19a68985 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c @@ -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 *