Merge bb6f15ba11 on remote branch

Change-Id: Ibd193470c8bfe81cbf882f98186e0275f8a16738
This commit is contained in:
Linux Build Service Account 2021-05-20 23:43:57 -07:00
commit 4035830e59

View file

@ -3492,6 +3492,11 @@ static void _sde_kms_pm_suspend_idle_helper(struct sde_kms *sde_kms,
if (sde_encoder_in_clone_mode(conn->encoder))
continue;
crtc_id = drm_crtc_index(conn->state->crtc);
if (priv->disp_thread[crtc_id].thread)
kthread_flush_worker(
&priv->disp_thread[crtc_id].worker);
ret = sde_encoder_wait_for_event(conn->encoder,
MSM_ENC_TX_COMPLETE);
if (ret && ret != -EWOULDBLOCK) {
@ -3499,7 +3504,6 @@ static void _sde_kms_pm_suspend_idle_helper(struct sde_kms *sde_kms,
"[conn: %d] wait for commit done returned %d\n",
conn->base.id, ret);
} else if (!ret) {
crtc_id = drm_crtc_index(conn->state->crtc);
if (priv->event_thread[crtc_id].thread)
kthread_flush_worker(
&priv->event_thread[crtc_id].worker);