diff options
| author | Stefan Schake | 2017-11-10 02:05:06 +0100 |
|---|---|---|
| committer | Eric Anholt | 2017-11-14 01:40:15 +0100 |
| commit | 253696ccd613fbdaa5aba1de44c461a058e0a114 (patch) | |
| tree | 284c09fc503a71016f85a609c5a226f6b50d0d71 | |
| parent | drm/rockchip: analogix_dp: Use mutex rather than spinlock (diff) | |
| download | kernel-qcow2-linux-253696ccd613fbdaa5aba1de44c461a058e0a114.tar.gz kernel-qcow2-linux-253696ccd613fbdaa5aba1de44c461a058e0a114.tar.xz kernel-qcow2-linux-253696ccd613fbdaa5aba1de44c461a058e0a114.zip | |
drm/vc4: Account for interrupts in flight
Synchronously disable the IRQ to make the following cancel_work_sync
invocation effective.
An interrupt in flight could enqueue further overflow mem work. As we
free the binner BO immediately following vc4_irq_uninstall this caused
a NULL pointer dereference in the work callback vc4_overflow_mem_work.
Link: https://github.com/anholt/linux/issues/114
Signed-off-by: Stefan Schake <stschake@gmail.com>
Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1510275907-993-2-git-send-email-stschake@gmail.com
| -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); } |