Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

+6 -2
+1 -1
drivers/gpu/drm/nouveau/nv50_vm.c
··· 156 156 pinstmem->flush(vm->dev); 157 157 158 158 /* BAR */ 159 - if (vm != dev_priv->chan_vm) { 159 + if (vm == dev_priv->bar1_vm || vm == dev_priv->bar3_vm) { 160 160 nv50_vm_flush_engine(vm->dev, 6); 161 161 return; 162 162 }
+5 -1
drivers/gpu/drm/nouveau/nvc0_vm.c
··· 105 105 struct drm_device *dev = vm->dev; 106 106 struct nouveau_vm_pgd *vpgd; 107 107 unsigned long flags; 108 - u32 engine = (dev_priv->chan_vm == vm) ? 1 : 5; 108 + u32 engine; 109 + 110 + engine = 1; 111 + if (vm == dev_priv->bar1_vm || vm == dev_priv->bar3_vm) 112 + engine |= 4; 109 113 110 114 pinstmem->flush(vm->dev); 111 115