diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:08:55 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:12:43 +0200 |
| commit | 77e97abf129c5028385dd72587eabab68db0d954 (patch) | |
| tree | fc52a8c2ba346da77281f00538a1eb6de49deb5d /target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch | |
| parent | 5d3a0c6b26144eb5d62515b99613b5ad8dbdc717 (diff) | |
| download | upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.gz upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.bz2 upstream-77e97abf129c5028385dd72587eabab68db0d954.zip | |
bcm27xx: update to latest patches from RPi foundation
Also removes random module and switches to new bcm2711 thermal driver.
Boot tested on RPi 4B v1.1 4G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch b/target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch new file mode 100644 index 0000000000..60c9c9b03f --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0281-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch @@ -0,0 +1,39 @@ +From d6baa1bd90e7e68ac69d5378d70174ea67bf35dc Mon Sep 17 00:00:00 2001 +From: James Hughes <james.hughes@raspberrypi.org> +Date: Mon, 29 Jul 2019 12:02:59 +0100 +Subject: [PATCH] Fixup FKMS interrupt handing for non-existent display + +If an errant interrupt flag was received from a non-existent display, +a NULL pointer access was made. Protect against this by checking if a +second display is present prior to checking the interrupt flags. +--- + drivers/gpu/drm/vc4/vc4_firmware_kms.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c +@@ -1087,14 +1087,17 @@ static irqreturn_t vc4_crtc_irq_handler( + vc4_crtc_handle_page_flip(crtc_list[0]); + } + +- /* Check for the secondary display too */ +- chan = readl(crtc_list[0]->regs + SMIDSW1); ++ if (crtc_list[1]) { ++ /* Check for the secondary display too */ ++ chan = readl(crtc_list[0]->regs + SMIDSW1); + +- if (chan & 1) { +- writel(SMI_NEW, crtc_list[0]->regs + SMIDSW1); +- if (crtc_list[1]->vblank_enabled) +- drm_crtc_handle_vblank(&crtc_list[1]->base); +- vc4_crtc_handle_page_flip(crtc_list[1]); ++ if (chan & 1) { ++ writel(SMI_NEW, crtc_list[0]->regs + SMIDSW1); ++ ++ if (crtc_list[1]->vblank_enabled) ++ drm_crtc_handle_vblank(&crtc_list[1]->base); ++ vc4_crtc_handle_page_flip(crtc_list[1]); ++ } + } + } + |