mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From 76b2727efaca513fe81b4ba56658ea2b9f9d0907 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
Date: Wed, 7 Aug 2019 11:31:08 +0100
|
||
|
|
Subject: [PATCH 765/826] drm/vc4: Add missing NULL check to
|
||
|
|
vc4_crtc_consume_event
|
||
|
|
|
||
|
|
vc4_crtc_consume_event wasn't checking crtc->state->event was
|
||
|
|
set before dereferencing it, leading to an OOPS.
|
||
|
|
|
||
|
|
Fixes "a5b534b drm/vc4: Resolve the vblank warnings on mode switching"
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
||
|
|
index 357b497f19ae..89ad71cff2bd 100644
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
||
|
|
@@ -969,6 +969,9 @@ static void vc4_crtc_consume_event(struct drm_crtc *crtc)
|
||
|
|
struct drm_device *dev = crtc->dev;
|
||
|
|
unsigned long flags;
|
||
|
|
|
||
|
|
+ if (!crtc->state->event)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
crtc->state->event->pipe = drm_crtc_index(crtc);
|
||
|
|
|
||
|
|
WARN_ON(drm_crtc_vblank_get(crtc) != 0);
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|