From: Ben Skeggs Date: Thu, 20 Aug 2015 04:54:14 +0000 (+1000) Subject: drm/nouveau/xtensa: switch to gpuobj accessor macros X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=edb1dc51de2f93905f49ba693c1777d6497a5cae;p=linux-beck.git drm/nouveau/xtensa: switch to gpuobj accessor macros Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c index dd5cef1d6330..974d7a0d7a36 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c @@ -120,8 +120,10 @@ _nvkm_xtensa_init(struct nvkm_object *object) nvkm_debug(subdev, "Loading firmware to address: %010llx\n", xtensa->gpu_fw->addr); + nvkm_kmap(xtensa->gpu_fw); for (i = 0; i < fw->size / 4; i++) - nv_wo32(xtensa->gpu_fw, i * 4, *((u32 *)fw->data + i)); + nvkm_wo32(xtensa->gpu_fw, i * 4, *((u32 *)fw->data + i)); + nvkm_done(xtensa->gpu_fw); release_firmware(fw); }