4.9-stable review patch.  If anyone has any objections, please let me know.


From: Stefan Schake <stsch...@gmail.com>

[ Upstream commit ce9caf2f79a5aa170a4b6456a03db639eed9c988 ]

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: 253696ccd613 ("drm/vc4: Account for interrupts in flight")
Signed-off-by: Stefan Schake <stsch...@gmail.com>
Signed-off-by: Eric Anholt <e...@anholt.net>
Tested-by: Stefan Wahren <stefan.wah...@i2se.com>
Reviewed-by: Eric Anholt <e...@anholt.net>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
 drivers/gpu/drm/vc4/vc4_irq.c |    3 ---
 drivers/gpu/drm/vc4/vc4_v3d.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/gpu/drm/vc4/vc4_irq.c
+++ b/drivers/gpu/drm/vc4/vc4_irq.c
@@ -208,9 +208,6 @@ vc4_irq_postinstall(struct drm_device *d
        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. */
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -173,6 +173,9 @@ static int vc4_v3d_runtime_resume(struct
        struct vc4_dev *vc4 = v3d->vc4;
+       /* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */
+       enable_irq(vc4->dev->irq);
        return 0;

Reply via email to