1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c
index 7d7af3a93d94..61b2e5377993 100644
--- a/drivers/gpu/drm/vc4/vc4_irq.c
+++ b/drivers/gpu/drm/vc4/vc4_irq.c
@@ -208,6 +208,9 @@ vc4_irq_postinstall(struct drm_device *dev)
 {
         struct vc4_dev *vc4 = to_vc4_dev(dev);
 
+        /* Undo the effects of a previous vc4_irq_uninstall. */
+        enable_irq(dev->irq);
+
         /* Enable both the render done and out of memory interrupts. */
         V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);
 
@@ -225,6 +228,9 @@ vc4_irq_uninstall(struct drm_device *dev)
         /* Clear any pending interrupts we might have left. */
         V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS);
 
+        /* Finish any interrupt handler still in flight. */
+        disable_irq(dev->irq);
+
         cancel_work_sync(&vc4->overflow_mem_work);
 }