evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DRM: SDE: Avoid vblank request to the same state"

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-13 12:17:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3b67a3866b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/gpu/drm/msm/sde/sde_crtc.c
View file

@ -1190,7 +1190,7 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
sde_crtc->vblank_requested) {
ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, false);
if (ret)
SDE_ERROR("%s vblank enable failed: %d\n",
SDE_ERROR("%s vblank disable failed: %d\n",
sde_crtc->name, ret);
}
@ -1491,16 +1491,18 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
sde_crtc = to_sde_crtc(crtc);
mutex_lock(&sde_crtc->crtc_lock);
SDE_EVT32(DRMID(&sde_crtc->base), en, sde_crtc->enabled,
sde_crtc->suspend, sde_crtc->vblank_requested);
if (sde_crtc->enabled && !sde_crtc->suspend) {
ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, en);
if (ret)
SDE_ERROR("%s vblank enable failed: %d\n",
sde_crtc->name, ret);
}
if (sde_crtc->vblank_requested != en) {
SDE_EVT32(DRMID(&sde_crtc->base), en, sde_crtc->enabled,
sde_crtc->suspend, sde_crtc->vblank_requested);
if (sde_crtc->enabled && !sde_crtc->suspend) {
ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, en);
if (ret)
SDE_ERROR("%s vblank enable failed: %d\n",
sde_crtc->name, ret);
}
sde_crtc->vblank_requested = en;
sde_crtc->vblank_requested = en;
}
mutex_unlock(&sde_crtc->crtc_lock);
return 0;