If we initialise BAR2 earlier, we're able to complete BAR1 setup using the instmem fast-path. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
@@ -146,6 +146,9 @@ gf100_bar_oneinit(struct nvkm_bar *base)
ret = gf100_bar_oneinit_bar(bar, &bar->bar[0], &bar2_lock, 3);
if (ret)
return ret;
+
+ bar->base.subdev.oneinit = true;
+ nvkm_bar_bar2_init(bar->base.subdev.device);
}
/* BAR1 */
@@ -159,6 +159,9 @@ nv50_bar_oneinit(struct nvkm_bar *base)
nvkm_wo32(bar->bar2, 0x14, 0x00000000);
nvkm_done(bar->bar2);
+ nvkm_bar_bar2_init(device);
start = 0x0000000000ULL;
limit = start + device->func->resource_size(device, 1);