|
@@ -3891,8 +3891,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;
|
|
return 0;
|
|
|
|
|
|
SDE_DEBUG("crtc%d: issuing hard reset\n", DRMID(crtc));
|
|
SDE_DEBUG("crtc%d: issuing hard reset\n", DRMID(crtc));
|