Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b79181cb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d359d51c

drivers/gpu/drm/nouveau/nv50_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/nouveau/nvc0_vm.c

+5 −1
Original line number Diff line number Diff line
@@ -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);