diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-24 11:33:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-24 11:33:29 +1000 |
| commit | c209101fc1c91a318422733a3721ff6a9ff7899f (patch) | |
| tree | bc00b2251b9b031db4cf9e72220f56ae72757e58 /drivers/gpu/drm/vc4/vc4_irq.c | |
| parent | 0576178f5012f30c5be12905f5628bb597bc91c6 (diff) | |
| parent | 9271c0ca573e02a360b636ecd8cb408852f4e9f6 (diff) | |
| download | linux-c209101fc1c91a318422733a3721ff6a9ff7899f.tar.gz linux-c209101fc1c91a318422733a3721ff6a9ff7899f.tar.xz | |
Merge tag 'drm-misc-fixes-2017-11-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
4.15 merge window fixes 1
* tag 'drm-misc-fixes-2017-11-20' of git://anongit.freedesktop.org/drm/drm-misc:
drm/edid: Don't send non-zero YQ in AVI infoframe for HDMI 1.x sinks
drm/vc4: Account for interrupts in flight
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_irq.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_irq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 7d7af3a93d94..61b2e5377993 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -208,6 +208,9 @@ 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); @@ -225,6 +228,9 @@ vc4_irq_uninstall(struct drm_device *dev) /* Clear any pending interrupts we might have left. */ V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS); + /* Finish any interrupt handler still in flight. */ + disable_irq(dev->irq); + cancel_work_sync(&vc4->overflow_mem_work); } |