mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001
|
|
From: Brian Norris <briannorris@chromium.org>
|
|
Date: Fri, 17 Jun 2022 17:26:52 -0700
|
|
Subject: [PATCH 39/51] drm/rockchip: vop: Don't crash for invalid
|
|
duplicate_state()
|
|
|
|
It's possible for users to try to duplicate the CRTC state even when the
|
|
state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other
|
|
users of __drm_atomic_helper_crtc_duplicate_state()) already guard this
|
|
with a WARN_ON() instead of crashing, so let's do that here too.
|
|
|
|
Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
|
|
Signed-off-by: Brian Norris <briannorris@chromium.org>
|
|
Reviewed-by: Sean Paul <seanpaul@chromium.org>
|
|
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid
|
|
---
|
|
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
@@ -1570,6 +1570,9 @@ static struct drm_crtc_state *vop_crtc_d
|
|
{
|
|
struct rockchip_crtc_state *rockchip_state;
|
|
|
|
+ if (WARN_ON(!crtc->state))
|
|
+ return NULL;
|
|
+
|
|
rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL);
|
|
if (!rockchip_state)
|
|
return NULL;
|