]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs
authorJonas Karlman <jonas@kwiboo.se>
Wed, 21 Jun 2023 22:33:17 +0000 (22:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 09:29:18 +0000 (10:29 +0100)
[ Upstream commit 13fc28804bf10ca0b7bce3efbba95c534836d7ca ]

struct rockchip_crtc_state members such as output_type, output_bpc and
enable_afbc is always reset to zero in the atomic_duplicate_state crtc
funcs.

Fix this by using kmemdup on the subclass rockchip_crtc_state struct.

Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230621223311.2239547-2-jonas@kwiboo.se
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/rockchip/rockchip_drm_vop.c

index 69eb0de9973fb7d22ff8738fa63d7d063bd14d4b..ea692046be6149ea8dd13e59899746e698c5820f 100644 (file)
@@ -1091,7 +1091,8 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc)
        if (WARN_ON(!crtc->state))
                return NULL;
 
-       rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL);
+       rockchip_state = kmemdup(to_rockchip_crtc_state(crtc->state),
+                                sizeof(*rockchip_state), GFP_KERNEL);
        if (!rockchip_state)
                return NULL;