* [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()
@ 2024-01-19 19:08 Harshit Mogalapalli
2024-01-22 10:31 ` Sascha Hauer
2024-02-13 20:06 ` Heiko Stuebner
0 siblings, 2 replies; 3+ messages in thread
From: Harshit Mogalapalli @ 2024-01-19 19:08 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, Andy Yan, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
Sascha Hauer, dri-devel, linux-arm-kernel, linux-rockchip,
linux-kernel
Cc: dan.carpenter, kernel-janitors, error27, harshit.m.mogalapalli
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>
---
This is based on static analysis. Only compile tested.
Note: Smatch found this.
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 85b3b4871a1d..fdd768bbd487 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -1985,8 +1985,10 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
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))
--
2.39.3
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()
2024-01-19 19:08 [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable() Harshit Mogalapalli
@ 2024-01-22 10:31 ` Sascha Hauer
2024-02-13 20:06 ` Heiko Stuebner
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2024-01-22 10:31 UTC (permalink / raw)
To: Harshit Mogalapalli
Cc: Sandy Huang, Heiko Stübner, Andy Yan, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel,
dan.carpenter, kernel-janitors, error27
On Fri, Jan 19, 2024 at 11:08:40AM -0800, Harshit Mogalapalli wrote:
> 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>
Thanks for fixing this.
Sascha
> ---
> This is based on static analysis. Only compile tested.
> Note: Smatch found this.
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index 85b3b4871a1d..fdd768bbd487 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -1985,8 +1985,10 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
> 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))
> --
> 2.39.3
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()
2024-01-19 19:08 [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable() Harshit Mogalapalli
2024-01-22 10:31 ` Sascha Hauer
@ 2024-02-13 20:06 ` Heiko Stuebner
1 sibling, 0 replies; 3+ messages in thread
From: Heiko Stuebner @ 2024-02-13 20:06 UTC (permalink / raw)
To: Sascha Hauer, Sandy Huang, linux-kernel, Harshit Mogalapalli,
Andy Yan, Thomas Zimmermann, dri-devel, David Airlie,
Maarten Lankhorst, linux-arm-kernel, linux-rockchip,
Daniel Vetter, Maxime Ripard
Cc: Heiko Stuebner, dan.carpenter, kernel-janitors, error27
On Fri, 19 Jan 2024 11:08:40 -0800, Harshit Mogalapalli wrote:
> Unlock before returning on the error path.
>
>
Applied, thanks!
[1/1] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()
commit: b6ddaa63f728d26c12048aed76be99c24f435c41
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-13 20:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-19 19:08 [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable() Harshit Mogalapalli
2024-01-22 10:31 ` Sascha Hauer
2024-02-13 20:06 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).