summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 04:54:14 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 02:40:28 (GMT)
commitedb1dc51de2f93905f49ba693c1777d6497a5cae (patch)
tree106275ebec36c0a28030ad25a1120666809f6e37 /drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
parent9cc264a3aac2ca62d8a2e13c8f13c8ef8567550b (diff)
downloadlinux-edb1dc51de2f93905f49ba693c1777d6497a5cae.tar.xz
drm/nouveau/xtensa: switch to gpuobj accessor macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
index dd5cef1..974d7a0 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);
}