]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/msm/mdp5: Return error code in mdp5_mixer_release when deadlock is detected
authorJessica Zhang <quic_jesszhan@quicinc.com>
Thu, 5 May 2022 21:40:51 +0000 (14:40 -0700)
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 6 May 2022 23:10:35 +0000 (02:10 +0300)
commitca75f6f7c6f89365e40f10f641b15981b1f07c31
treed6bf407201711bed675d93da4e0e51326de7a0ae
parentd59be579fa932c46b908f37509f319cbd4ca9a68
drm/msm/mdp5: Return error code in mdp5_mixer_release when deadlock is detected

There is a possibility for mdp5_get_global_state to return
-EDEADLK when acquiring the modeset lock, but currently global_state in
mdp5_mixer_release doesn't check for if an error is returned.

To avoid a NULL dereference error, let's have mdp5_mixer_release
check if an error is returned and propagate that error.

Reported-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Fixes: 7907a0d77cb4 ("drm/msm/mdp5: Use the new private_obj state")
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/485181/
Link: https://lore.kernel.org/r/20220505214051.155-2-quic_jesszhan@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h