drm/msm/dp: fix runtime PM leak on connect failure

jhovold · Abhinav Kumar · commit e86750b01a15 · 2024-03-29T13:07:41.000-07:00
Make sure to balance the runtime PM usage counter (and suspend) before returning on connect failures (e.g. DPCD read failures after a spurious connect event or if link training fails). Fixes: 5814b8b ("drm/msm/dp: incorporate pm_runtime framework into DP driver") Cc: stable@vger.kernel.org # 6.8 Cc: Kuogee Hsieh <quic_khsieh@quicinc.com> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Patchwork: https://patchwork.freedesktop.org/patch/582746/ Link: https://lore.kernel.org/r/20240313164306.23133-3-johan+linaro@kernel.org Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -572,6 +572,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
 	ret = dp_display_usbpd_configure_cb(&pdev->dev);
 	if (ret) {	/* link train failed */
 		dp->hpd_state = ST_DISCONNECTED;
+		pm_runtime_put_sync(&pdev->dev);
 	} else {
 		dp->hpd_state = ST_MAINLINK_READY;
 	}

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)`
`572`	`572`	`ret = dp_display_usbpd_configure_cb(&pdev->dev);`
`573`	`573`	`if (ret) { /* link train failed */`
`574`	`574`	`dp->hpd_state = ST_DISCONNECTED;`
	`575`	`+ pm_runtime_put_sync(&pdev->dev);`
`575`	`576`	`} else {`
`576`	`577`	`dp->hpd_state = ST_MAINLINK_READY;`
`577`	`578`	`}`