Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nv50_vm.c

diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 44fbac9c7d938fab4f6cf6e947c7d70e4dcfbc62..179bb42a635c2fb76480f14c6fef660a12296f59 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -147,7 +147,6 @@ nv50_vm_flush(struct nouveau_vm *vm)
 {
        struct drm_nouveau_private *dev_priv = vm->dev->dev_private;
        struct nouveau_instmem_engine *pinstmem = &dev_priv->engine.instmem;
-       struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
        int i;
 
        pinstmem->flush(vm->dev);
@@ -158,7 +157,6 @@ nv50_vm_flush(struct nouveau_vm *vm)
                return;
        }
 
-       pfifo->tlb_flush(vm->dev);
        for (i = 0; i < NVOBJ_ENGINE_NR; i++) {
                if (atomic_read(&vm->engref[i]))
                        dev_priv->eng[i]->tlb_flush(vm->dev, i);