bcm27xx: sync 5.4 patches with RPi Foundation
[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0295-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch
1 From e2e9da35d4a598490b73da41eea1db27540339fd Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Wed, 7 Aug 2019 11:31:08 +0100
4 Subject: [PATCH] drm/vc4: Add missing NULL check to
5 vc4_crtc_consume_event
6
7 vc4_crtc_consume_event wasn't checking crtc->state->event was
8 set before dereferencing it, leading to an OOPS.
9
10 Fixes "a5b534b drm/vc4: Resolve the vblank warnings on mode switching"
11
12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
13 ---
14 drivers/gpu/drm/vc4/vc4_firmware_kms.c | 3 +++
15 1 file changed, 3 insertions(+)
16
17 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
18 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
19 @@ -1000,6 +1000,9 @@ static void vc4_crtc_consume_event(struc
20 struct drm_device *dev = crtc->dev;
21 unsigned long flags;
22
23 + if (!crtc->state->event)
24 + return;
25 +
26 crtc->state->event->pipe = drm_crtc_index(crtc);
27
28 WARN_ON(drm_crtc_vblank_get(crtc) != 0);