drm/nouveau/bar: prevent BAR2 mapping of objects during destructor

GP100's page table nests a lot more deeply than the GF100-compatible
layout we're currently using, which means our hackish-but-simple way
of dealing with BAR2 VMM teardown won't work anymore.

In order to sanely handle the chicken-and-egg (BAR2's PTs get mapped
into themselves) problem, we need prevent page tables getting mapped
back into BAR2 during the destruction of its VMM.

To do this, we simply key off the state that's now maintained by the
BAR2 init/fini functions.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-11-01 03:56:19 +10:00
parent a78dbce9a1
commit bb7e501a66
1 changed files with 1 additions and 1 deletions

View File

@ -43,7 +43,7 @@ nvkm_bar_bar2_vmm(struct nvkm_device *device)
* to know when object access needs to go through the BAR0 window.
*/
struct nvkm_bar *bar = device->bar;
if (bar && bar->func->bar2.vmm && bar->subdev.oneinit)
if (bar && bar->bar2)
return bar->func->bar2.vmm(bar);
return NULL;
}