Skip to contentSkip to conversation

drm/rockchip: vop2: unlock on error path in vop2_crtc_atomic_enable()

PATCH Applied Dan Carpenter 3 participants 3 messages May 9, 2022 – May 15, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/rockchip: vop2: unlock on error path in vop2_crtc_atomic_enable()

This error path needs an unlock before returning.

Fixes 604be85547ce ("drm/rockchip: Add VOP2 driver")
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +1 -0
index 0b49fed16535..b68922943825 100644
@@ -1524,6 +1524,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
 	if (ret < 0) {
 		drm_err(vop2->drm, "failed to enable dclk for video port%d - %d\n",
 			vp->id, ret);
+		vop2_unlock(vop2);
 		return;
 	}
 
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Dan Carpenter

This error path needs an unlock before returning.

Indeed.

Quoted 3 lines
Fixes 604be85547ce ("drm/rockchip: Add VOP2 driver")

Sascha

Quoted 20 lines
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +1 -0
index 0b49fed16535..b68922943825 100644
@@ -1524,6 +1524,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
 	if (ret < 0) {
 		drm_err(vop2->drm, "failed to enable dclk for video port%d - %d\n",
 			vp->id, ret);
+		vop2_unlock(vop2);
 		return;
 	}
 
Signature · 1 line
2.35.1
Signature · 4 lines
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 |
maintainer Applied
#2 lore raw
In reply to Dan Carpenter
Quoted 1 line · Dan Carpenter

This error path needs an unlock before returning.

Applied, thanks!

[1/1] drm/rockchip: vop2: unlock on error path in vop2_crtc_atomic_enable()

      commit: 98526c5bbe3267d447ddd076b685439e3e1396c6

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>