Commit 8e644cb2 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/bar: initialise bar2 during oneinit

If we initialise BAR2 earlier, we're able to complete BAR1 setup using
the instmem fast-path.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent bb7e501a
...@@ -146,6 +146,9 @@ gf100_bar_oneinit(struct nvkm_bar *base) ...@@ -146,6 +146,9 @@ gf100_bar_oneinit(struct nvkm_bar *base)
ret = gf100_bar_oneinit_bar(bar, &bar->bar[0], &bar2_lock, 3); ret = gf100_bar_oneinit_bar(bar, &bar->bar[0], &bar2_lock, 3);
if (ret) if (ret)
return ret; return ret;
bar->base.subdev.oneinit = true;
nvkm_bar_bar2_init(bar->base.subdev.device);
} }
/* BAR1 */ /* BAR1 */
......
...@@ -159,6 +159,9 @@ nv50_bar_oneinit(struct nvkm_bar *base) ...@@ -159,6 +159,9 @@ nv50_bar_oneinit(struct nvkm_bar *base)
nvkm_wo32(bar->bar2, 0x14, 0x00000000); nvkm_wo32(bar->bar2, 0x14, 0x00000000);
nvkm_done(bar->bar2); nvkm_done(bar->bar2);
bar->base.subdev.oneinit = true;
nvkm_bar_bar2_init(device);
/* BAR1 */ /* BAR1 */
start = 0x0000000000ULL; start = 0x0000000000ULL;
limit = start + device->func->resource_size(device, 1); limit = start + device->func->resource_size(device, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment