drm/msm/dp: fix runtime_pm handling in dp_wait_hpd_asserted
[ Upstream commitaeacc39e20] The function dp_wait_hpd_asserted() uses pm_runtime_get_sync() and doesn't care about the return value. Potentially this can lead to unclocked access if for some reason resuming of the DP controller fails. Change the function to use pm_runtime_resume_and_get() and return an error if resume fails. Fixes:e2969ee302("drm/msm/dp: move of_dp_aux_populate_bus() to eDP probe()") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Patchwork: https://patchwork.freedesktop.org/patch/580137/ Link: https://lore.kernel.org/r/20240226223446.4194079-1-dmitry.baryshkov@linaro.org [quic_abhinavk@quicinc.com: resolved trivial conflict while rebase] Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Rob Clark <robdclark@chromium.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7deaf31e79
commit
e1d86efd46
@@ -513,7 +513,10 @@ static int dp_wait_hpd_asserted(struct drm_dp_aux *dp_aux,
|
||||
|
||||
aux = container_of(dp_aux, struct dp_aux_private, dp_aux);
|
||||
|
||||
pm_runtime_get_sync(aux->dev);
|
||||
ret = pm_runtime_resume_and_get(aux->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog, wait_us);
|
||||
pm_runtime_put_sync(aux->dev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user