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

Merge "Revert "disp: msm: sde: fix race between disable commit and vblank work""

Browse Source
This commit is contained in:
qctecmdr
2020-11-12 21:31:12 -08:00
committed by Gerrit - the friendly Code Review server
parent 6fa30971f2 f6cfe46a3c
commit 76dcac0a20
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
msm/sde/sde_crtc.c
View File

@@ -3849,10 +3849,8 @@ static int _sde_crtc_vblank_enable_no_lock(
if (ret < 0) if (ret < 0)
return ret; return ret;
drm_for_each_encoder(enc, crtc->dev) { drm_for_each_encoder_mask(enc, crtc->dev,
if (enc->crtc != crtc) crtc->state->encoder_mask) {
continue;
SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable, SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
sde_crtc->enabled); sde_crtc->enabled);
@@ -3860,10 +3858,8 @@ static int _sde_crtc_vblank_enable_no_lock(
sde_crtc_vblank_cb, (void *)crtc); sde_crtc_vblank_cb, (void *)crtc);
} }
} else { } else {
drm_for_each_encoder(enc, crtc->dev) { drm_for_each_encoder_mask(enc, crtc->dev,
if (enc->crtc != crtc) crtc->state->encoder_mask) {
continue;
SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable, SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
sde_crtc->enabled); sde_crtc->enabled);