Skip to content

Commit ce9caf2

Browse files
stschakeanholt
authored andcommitted
drm/vc4: Move IRQ enable to PM path
We were calling enable_irq on bind, where it was already enabled previously by the IRQ helper. Additionally, dev->irq is not set correctly until after postinstall and so was always zero here, triggering a warning in 4.15. Fix both by moving the enable to the power management resume path, where we know there was a previous disable invocation during suspend. Fixes: 253696c ("drm/vc4: Account for interrupts in flight") Signed-off-by: Stefan Schake <[email protected]> Signed-off-by: Eric Anholt <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Tested-by: Stefan Wahren <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
1 parent e7cdf5c commit ce9caf2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/gpu/drm/vc4/vc4_irq.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,6 @@ vc4_irq_postinstall(struct drm_device *dev)
209209
{
210210
struct vc4_dev *vc4 = to_vc4_dev(dev);
211211

212-
/* Undo the effects of a previous vc4_irq_uninstall. */
213-
enable_irq(dev->irq);
214-
215212
/* Enable both the render done and out of memory interrupts. */
216213
V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);
217214

drivers/gpu/drm/vc4/vc4_v3d.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ static int vc4_v3d_runtime_resume(struct device *dev)
327327
return ret;
328328

329329
vc4_v3d_init_hw(vc4->dev);
330+
331+
/* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */
332+
enable_irq(vc4->dev->irq);
330333
vc4_irq_postinstall(vc4->dev);
331334

332335
return 0;

0 commit comments

Comments
 (0)