Merge "disp: msm: sde: perform only soft reset during timeout scenarios"

This commit is contained in:
qctecmdr 2021-04-06 07:15:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit c27837e496

View file

@ -3636,8 +3636,11 @@ int sde_crtc_reset_hw(struct drm_crtc *crtc, struct drm_crtc_state *old_state,
}
}
/* Early out if simple ctl reset succeeded */
if (i == sde_crtc->num_ctls)
/*
* Early out if simple ctl reset succeeded or reset is
* being performed after timeout
*/
if (i == sde_crtc->num_ctls || crtc->state == old_state)
return 0;
SDE_DEBUG("crtc%d: issuing hard reset\n", DRMID(crtc));