diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-11-16 17:25:17 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-11-16 17:25:17 +0000 |
| commit | 57d23c26c7ddd6f35b68c480fde792b6273c389e (patch) | |
| tree | be5e27d1d1d6006ee41a42596f10de689a9d2818 | |
| parent | 8d54d185ffb14361bf0ce3daff4f15c6029d7859 (diff) | |
| download | kernel-57d23c26c7ddd6f35b68c480fde792b6273c389e.tar.gz kernel-57d23c26c7ddd6f35b68c480fde792b6273c389e.tar.xz kernel-57d23c26c7ddd6f35b68c480fde792b6273c389e.zip | |
Add fix for vc4 interupts
| -rw-r--r-- | kernel.spec | 2 | ||||
| -rw-r--r-- | rpi-graphics-fix.patch | 46 |
2 files changed, 48 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 73026b9ff..b5c9c71eb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -610,6 +610,8 @@ Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe # bcm2837 bluetooth support Patch323: bcm2837-bluetooth-support.patch +Patch324: rpi-graphics-fix.patch + # Generic fixes and enablement for Socionext SoC and 96board # https://patchwork.kernel.org/patch/9980861/ Patch331: PCI-aspm-deal-with-missing-root-ports-in-link-state-handling.patch diff --git a/rpi-graphics-fix.patch b/rpi-graphics-fix.patch new file mode 100644 index 000000000..89bfaf9a5 --- /dev/null +++ b/rpi-graphics-fix.patch @@ -0,0 +1,46 @@ +From 253696ccd613fbdaa5aba1de44c461a058e0a114 Mon Sep 17 00:00:00 2001 +From: Stefan Schake <stschake@gmail.com> +Date: Fri, 10 Nov 2017 02:05:06 +0100 +Subject: 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 + +diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c +index 7d7af3a..61b2e53 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); + } + +-- +cgit v0.10.2 + |