Commit 649ec925 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nve0/fifo: keep mmu fault interrupts enabled at all times



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e1b6b14a
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -753,6 +753,21 @@ nve0_fifo_uevent_disable(struct nouveau_event *event, int index)
	nv_mask(priv, 0x002140, 0x80000000, 0x00000000);
}

int
nve0_fifo_fini(struct nouveau_object *object, bool suspend)
{
	struct nve0_fifo_priv *priv = (void *)object;
	int ret;

	ret = nouveau_fifo_fini(&priv->base, suspend);
	if (ret)
		return ret;

	/* allow mmu fault interrupts, even when we're not using fifo */
	nv_mask(priv, 0x002140, 0x10000000, 0x10000000);
	return 0;
}

int
nve0_fifo_init(struct nouveau_object *object)
{
@@ -855,7 +870,7 @@ nve0_fifo_oclass = &(struct nve0_fifo_impl) {
		.ctor = nve0_fifo_ctor,
		.dtor = nve0_fifo_dtor,
		.init = nve0_fifo_init,
		.fini = _nouveau_fifo_fini,
		.fini = nve0_fifo_fini,
	},
	.channels = 4096,
}.base;