blob: 60c9c9b03f00622f6fa57b0a2276c6b181786fb3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
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]);
+ }
}
}
|
