Merge "DRM: SDE: Avoid vblank request to the same state" (3b67a386) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/drm/msm/sde/sde_crtc.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -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,6 +1491,7 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
		sde_crtc = to_sde_crtc(crtc);

		mutex_lock(&sde_crtc->crtc_lock);
		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) {
		@@ -1501,6 +1502,7 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
		}

		sde_crtc->vblank_requested = en;
		}
		mutex_unlock(&sde_crtc->crtc_lock);

		return 0;