mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From c2957d7709a43c81e5345d537feaa6980ffcc1a4 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
|
|
@@ -1056,14 +1056,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]);
|
|
+ }
|
|
}
|
|
}
|
|
|