diff options
| author | Stefan Schake <stschake@gmail.com> | 2017-12-29 17:05:43 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2018-01-03 15:56:03 -0800 |
| commit | ce9caf2f79a5aa170a4b6456a03db639eed9c988 (patch) | |
| tree | 5204a4d4e5ca8c02fc3c6a4cf608f1c1e2896f85 /drivers/gpu/drm/vc4/vc4_irq.c | |
| parent | e7cdf5c82f1773c3386b93bbcf13b9bfff29fa31 (diff) | |
| download | talos-obmc-linux-ce9caf2f79a5aa170a4b6456a03db639eed9c988.tar.gz talos-obmc-linux-ce9caf2f79a5aa170a4b6456a03db639eed9c988.zip | |
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: 253696ccd613 ("drm/vc4: Account for interrupts in flight")
Signed-off-by: Stefan Schake <stschake@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1514563543-32511-1-git-send-email-stschake@gmail.com
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_irq.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_irq.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 26eddbb62893..3dd62d75f531 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -209,9 +209,6 @@ 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); |
