drm/nv50-nvc0/vm: don't touch chan_vm

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 1a0dd491a0e44257dc1eb4dc87005b4b3d18f1dc..40b84f22d819cd8f95e542429395d02120708980 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -156,7 +156,7 @@ nv50_vm_flush(struct nouveau_vm *vm)
        pinstmem->flush(vm->dev);
 
        /* BAR */
-       if (vm != dev_priv->chan_vm) {
+       if (vm == dev_priv->bar1_vm || vm == dev_priv->bar3_vm) {
                nv50_vm_flush_engine(vm->dev, 6);
                return;
        }

diff --git a/drivers/gpu/drm/nouveau/nvc0_vm.c b/drivers/gpu/drm/nouveau/nvc0_vm.c
index a179e6c55afbaeaaabcc71de6d834c5426abb6b9..9e352944a35ae2cc3c5c29abf1529227242f2053 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_vm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_vm.c
@@ -105,7 +105,11 @@ nvc0_vm_flush(struct nouveau_vm *vm)
        struct drm_device *dev = vm->dev;
        struct nouveau_vm_pgd *vpgd;
        unsigned long flags;
-       u32 engine = (dev_priv->chan_vm == vm) ? 1 : 5;
+       u32 engine;
+
+       engine = 1;
+       if (vm == dev_priv->bar1_vm || vm == dev_priv->bar3_vm)
+               engine |= 4;
 
        pinstmem->flush(vm->dev);