|
@@ -208,6 +208,9 @@ vc4_irq_postinstall(struct drm_device *dev)
|
|
{
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(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. */
|
|
/* Enable both the render done and out of memory interrupts. */
|
|
V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);
|
|
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. */
|
|
/* Clear any pending interrupts we might have left. */
|
|
V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS);
|
|
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);
|
|
cancel_work_sync(&vc4->overflow_mem_work);
|
|
}
|
|
}
|
|
|
|
|