samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: avoid rc lock deadlock during esd failure"

Browse Source
This commit is contained in:
qctecmdr
2019-05-22 12:20:00 -07:00
committed by Gerrit - the friendly Code Review server
parent 6af277472c 56e88a7fdc
commit 80aed77020
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
msm/sde/sde_encoder.c
View File

@@ -5838,7 +5838,8 @@ int sde_encoder_update_caps_for_cont_splash(struct drm_encoder *encoder,
return ret;
}
int sde_encoder_display_failure_notification(struct drm_encoder *enc)
int sde_encoder_display_failure_notification(struct drm_encoder *enc,
bool skip_pre_kickoff)
{
struct msm_drm_thread *event_thread = NULL;
struct msm_drm_private *priv = NULL;
@@ -5864,9 +5865,11 @@ int sde_encoder_display_failure_notification(struct drm_encoder *enc)
event_thread = &priv->event_thread[sde_enc->crtc->index];
kthread_queue_work(&event_thread->worker,
&sde_enc->esd_trigger_work);
kthread_flush_work(&sde_enc->esd_trigger_work);
if (!skip_pre_kickoff) {
kthread_queue_work(&event_thread->worker,
&sde_enc->esd_trigger_work);
kthread_flush_work(&sde_enc->esd_trigger_work);
}
/**
* panel may stop generating te signal (vsync) during esd failure. rsc
@@ -5875,7 +5878,8 @@ int sde_encoder_display_failure_notification(struct drm_encoder *enc)
*/
_sde_encoder_switch_to_watchdog_vsync(enc);
sde_encoder_wait_for_event(enc, MSM_ENC_TX_COMPLETE);
if (!skip_pre_kickoff)
sde_encoder_wait_for_event(enc, MSM_ENC_TX_COMPLETE);
return 0;
}