mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 22:40:54 -04:00
Merge "disp: msm: sde: flush all event thread work during CRTC disable"
This commit is contained in:
commit
a493aaf3a2
1 changed files with 3 additions and 3 deletions
|
|
@ -3504,7 +3504,7 @@ static void sde_crtc_destroy_state(struct drm_crtc *crtc,
|
|||
&cstate->property_state);
|
||||
}
|
||||
|
||||
static int _sde_crtc_flush_event_thread(struct drm_crtc *crtc)
|
||||
static int _sde_crtc_flush_frame_events(struct drm_crtc *crtc)
|
||||
{
|
||||
struct sde_crtc *sde_crtc;
|
||||
int i;
|
||||
|
|
@ -3780,7 +3780,7 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
|
|||
|
||||
sde_crtc_calc_fps(sde_crtc);
|
||||
SDE_ATRACE_BEGIN("flush_event_thread");
|
||||
_sde_crtc_flush_event_thread(crtc);
|
||||
_sde_crtc_flush_frame_events(crtc);
|
||||
SDE_ATRACE_END("flush_event_thread");
|
||||
sde_crtc->plane_mask_old = crtc->state->plane_mask;
|
||||
|
||||
|
|
@ -4162,7 +4162,7 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
|
|||
(u8 *)&power_on);
|
||||
|
||||
mutex_unlock(&sde_crtc->crtc_lock);
|
||||
_sde_crtc_flush_event_thread(crtc);
|
||||
kthread_flush_worker(&priv->event_thread[crtc->index].worker);
|
||||
mutex_lock(&sde_crtc->crtc_lock);
|
||||
|
||||
kthread_cancel_delayed_work_sync(&sde_crtc->static_cache_read_work);
|
||||
|
|
|
|||
Loading…
Reference in a new issue