32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From b6ddaa63f728d26c12048aed76be99c24f435c41 Mon Sep 17 00:00:00 2001
|
|
From: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
|
|
Date: Fri, 19 Jan 2024 11:08:40 -0800
|
|
Subject: [PATCH] drm/rockchip: vop2: add a missing unlock in
|
|
vop2_crtc_atomic_enable()
|
|
|
|
Unlock before returning on the error path.
|
|
|
|
Fixes: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588")
|
|
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
|
|
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20240119190841.1619443-1-harshit.m.mogalapalli@oracle.com
|
|
---
|
|
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
@@ -1996,8 +1996,10 @@ static void vop2_crtc_atomic_enable(stru
|
|
clock = vop2_set_intf_mux(vp, rkencoder->crtc_endpoint_id, polflags);
|
|
}
|
|
|
|
- if (!clock)
|
|
+ if (!clock) {
|
|
+ vop2_unlock(vop2);
|
|
return;
|
|
+ }
|
|
|
|
if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
|
|
!(vp_data->feature & VOP2_VP_FEATURE_OUTPUT_10BIT))
|