diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-09 10:23:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-09 10:23:48 +1000 |
| commit | 909ef254ee3bfb305524b6651c2e74c4b330d8df (patch) | |
| tree | eba7c168ca9c511f00b02272972d65c42bd16dd2 /drivers | |
| parent | b2cd1df66037e7c4697c7e40496bf7e4a5e16a2d (diff) | |
| parent | ce9caf2f79a5aa170a4b6456a03db639eed9c988 (diff) | |
| download | linux-stable-909ef254ee3bfb305524b6651c2e74c4b330d8df.tar.gz linux-stable-909ef254ee3bfb305524b6651c2e74c4b330d8df.tar.bz2 linux-stable-909ef254ee3bfb305524b6651c2e74c4b330d8df.zip | |
Merge tag 'drm-misc-fixes-2018-01-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Just one vc4 fix.
* tag 'drm-misc-fixes-2018-01-08' of git://anongit.freedesktop.org/drm/drm-misc:
drm/vc4: Move IRQ enable to PM path
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_irq.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_v3d.c | 3 |
2 files changed, 3 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); diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 622cd43840b8..493f392b3a0a 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -327,6 +327,9 @@ static int vc4_v3d_runtime_resume(struct device *dev) return ret; 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; |