diff options
author | Dave Airlie <airlied@redhat.com> | 2017-10-19 01:09:57 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-10-19 01:09:57 +0300 |
commit | a3a3d47935e0f31074c885b65c6869322e3e5044 (patch) | |
tree | e4b71e46e667e4b17175229c6d688c7fca5bb32b /drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | |
parent | 2de0307323fc42c6395d0eafec9879d55e042c85 (diff) | |
parent | 4813766325374af6ed0b66879ba6a0bbb05c83b6 (diff) | |
download | linux-a3a3d47935e0f31074c885b65c6869322e3e5044.tar.xz |
Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes
some nouveau fixes.
* 'linux-4.14' of git://github.com/skeggsb/linux:
drm/nouveau/fbcon: fix oops without fbdev emulation
drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards
drm/nouveau/bsp/g92: disable by default
drm/nouveau/mmu: flush tlbs before deleting page tables
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c index d06ad2c372bf..455da298227f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c @@ -241,6 +241,8 @@ nvkm_vm_unmap_pgt(struct nvkm_vm *vm, int big, u32 fpde, u32 lpde) mmu->func->map_pgt(vpgd->obj, pde, vpgt->mem); } + mmu->func->flush(vm); + nvkm_memory_del(&pgt); } } |