diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:14 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:28 +1000 |
commit | edb1dc51de2f93905f49ba693c1777d6497a5cae (patch) | |
tree | 106275ebec36c0a28030ad25a1120666809f6e37 | |
parent | 9cc264a3aac2ca62d8a2e13c8f13c8ef8567550b (diff) | |
download | linux-edb1dc51de2f93905f49ba693c1777d6497a5cae.tar.bz2 |
drm/nouveau/xtensa: switch to gpuobj accessor macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 4 |
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 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); } |