Unverified Commit 9b6f4615 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: v3d: Stop disabling interrupts 



The vc4_irq_disable(), among other things, will call disable_irq() to
complete any in-flight interrupts.

This requires its counterpart, vc4_irq_enable(), to call enable_irq() which
causes issues addressed in a later patch.

However, vc4_irq_disable() is called by two callees: vc4_irq_uninstall()
and vc4_v3d_runtime_suspend().

vc4_irq_uninstall() also calls free_irq() which already disables the
interrupt line. We thus don't require an explicit disable_irq() for that
call site.

vc4_v3d_runtime_suspend() doesn't have any other code. However, the rest of
vc4_irq_disable() masks the interrupts coming from the v3d, so explictly
disabling the interrupt line is also redundant.

The only thing we really care about is thus to make sure we don't have any
handler in-flight, as suggested by the comment. We can thus replace
disable_irq() by synchronize_irq().

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-68-maxime@cerno.tech
parent 57d68ee8

drivers/gpu/drm/vc4/vc4_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ vc4_irq_disable(struct drm_device *dev) 
	V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS);



	/* Finish any interrupt handler still in flight. */

	disable_irq(vc4->irq);

	synchronize_irq(vc4->irq);



	cancel_work_sync(&vc4->overflow_mem_work);

}

drivers/gpu/drm/vc4/vc4_v3d.c

+0 −2
Original line number Diff line number Diff line
@@ -393,8 +393,6 @@ static int vc4_v3d_runtime_resume(struct device *dev) 


	vc4_v3d_init_hw(&vc4->base);



	/* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */

	enable_irq(vc4->irq);

	vc4_irq_enable(&vc4->base);



	return 0;