2024-01-19 19:09:43

by Harshit Mogalapalli

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 <[email protected]>
---
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

2024-01-22 10:34:08

by Sascha Hauer

Subject: Re: [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()

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 <[email protected]>

Reviewed-by: Sascha Hauer <[email protected]>

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 |

2024-02-13 20:07:20

by Heiko Stübner

Subject: Re: [PATCH] drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()

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 <[email protected]>