Patch "drm/vc4: Move IRQ enable to PM path" has been added to the 4.9-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
drm/vc4: Move IRQ enable to PM path
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-vc4-move-irq-enable-to-pm-path.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Feb 1 14:00:34 CET 2018
From: Stefan Schake <[email protected]>
Date: Fri, 29 Dec 2017 17:05:43 +0100
Subject: drm/vc4: Move IRQ enable to PM path
From: Stefan Schake <[email protected]>
[ 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.
--- drivers/gpu/drm/vc4/vc4_irq.c | 3 --- drivers/gpu/drm/vc4/vc4_v3d.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/vc4/vc4_irq.c +0 -3
@@ -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. */ V3D_WRITE (V3D_INTENA ,V3D_DRIVER_IRQS );
drivers/gpu/drm/vc4/vc4_v3d.c +3 -0
@@ -173,6 +173,9 @@ static int vc4_v3d_runtime_resume(structstruct vc4_dev *vc4 = v3d->vc4;vc4_v3d_init_hw (vc4->dev); + +/* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */ +enable_irq (vc4->dev->irq);vc4_irq_postinstall (vc4->dev);return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/drm-vc4-move-irq-enable-to-pm-path.patch queue-4.9/drm-vc4-account-for-interrupts-in-flight.patch