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

index dcf1782675feb98b5b01e0f9d8f49531ea7f668f..d2849ece1ba669cd8f31a05e77699ac227495deb 100644 (file)
@@ -175,8 +175,10 @@ _nvkm_falcon_init(struct nvkm_object *object)
                        return ret;
                }
 
+               nvkm_kmap(falcon->core);
                for (i = 0; i < falcon->code.size; i += 4)
-                       nv_wo32(falcon->core, i, falcon->code.data[i / 4]);
+                       nvkm_wo32(falcon->core, i, falcon->code.data[i / 4]);
+               nvkm_done(falcon->core);
        }
 
        /* upload firmware bootloader (or the full code segments) */