drm/msm/mdp5: Return error code in mdp5_mixer_release when deadlock is detected

[mirror_ubuntu-kernels.git] / drivers / gpu / drm / msm / disp / mdp5 / mdp5_crtc.c

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
index b966cd69f99dd93093c5ed3ffb14bdc50d2f6e64..fe2922c8d21bf351f51f2be5a255a46e05852dc0 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
@@ -612,9 +612,15 @@ static int mdp5_crtc_setup_pipeline(struct drm_crtc *crtc,
                if (ret)
                        return ret;
 
-               mdp5_mixer_release(new_crtc_state->state, old_mixer);
+               ret = mdp5_mixer_release(new_crtc_state->state, old_mixer);
+               if (ret)
+                       return ret;
+
                if (old_r_mixer) {
-                       mdp5_mixer_release(new_crtc_state->state, old_r_mixer);
+                       ret = mdp5_mixer_release(new_crtc_state->state, old_r_mixer);
+                       if (ret)
+                               return ret;
+
                        if (!need_right_mixer)
                                pipeline->r_mixer = NULL;
                }