-
由 Jessica Zhang 提交于
stable inclusion from stable-v5.10.121 commit 883f1d52a57bf51e1d7a80c432345e2c6222477e category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=883f1d52a57bf51e1d7a80c432345e2c6222477e -------------------------------- [ Upstream commit ca75f6f7 ] 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: NTomeu Vizoso <tomeu.vizoso@collabora.com> Signed-off-by: NJessica Zhang <quic_jesszhan@quicinc.com> Fixes: 7907a0d7 ("drm/msm/mdp5: Use the new private_obj state") Reviewed-by: NRob Clark <robdclark@gmail.com> Reviewed-by: NDmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/485181/ Link: https://lore.kernel.org/r/20220505214051.155-2-quic_jesszhan@quicinc.comSigned-off-by: NDmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: NSasha Levin <sashal@kernel.org> Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com> Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
ec5de1a9