diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index 1516ab2116..8d2cc21a3c 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -3621,6 +3621,7 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
 static int _sde_crtc_vblank_enable_no_lock(
 		struct sde_crtc *sde_crtc, bool enable)
 {
+	struct drm_device *dev;
 	struct drm_crtc *crtc;
 	struct drm_encoder *enc;
 
@@ -3630,6 +3631,7 @@ static int _sde_crtc_vblank_enable_no_lock(
 	}
 
 	crtc = &sde_crtc->base;
+	dev = crtc->dev;
 
 	if (enable) {
 		int ret;
@@ -3641,27 +3643,27 @@ static int _sde_crtc_vblank_enable_no_lock(
 		if (ret < 0)
 			return ret;
 
-		drm_for_each_encoder_mask(enc, crtc->dev,
-			crtc->state->encoder_mask) {
+		list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
 			if (enc->crtc != crtc)
 				continue;
 
 			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
 					sde_crtc->enabled,
-					sde_crtc->suspend);
+					sde_crtc->suspend,
+					sde_crtc->vblank_requested);
 
 			sde_encoder_register_vblank_callback(enc,
 					sde_crtc_vblank_cb, (void *)crtc);
 		}
 	} else {
-		drm_for_each_encoder_mask(enc, crtc->dev,
-			crtc->state->encoder_mask) {
+		list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
 			if (enc->crtc != crtc)
 				continue;
 
 			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
 					sde_crtc->enabled,
-					sde_crtc->suspend);
+					sde_crtc->suspend,
+					sde_crtc->vblank_requested);
 
 			sde_encoder_register_vblank_callback(enc, NULL, NULL);
 		}
@@ -3685,6 +3687,7 @@ static void _sde_crtc_set_suspend(struct drm_crtc *crtc, bool enable)
 	struct sde_crtc *sde_crtc;
 	struct msm_drm_private *priv;
 	struct sde_kms *sde_kms;
+	int ret = 0;
 
 	if (!crtc || !crtc->dev || !crtc->dev->dev_private) {
 		SDE_ERROR("invalid crtc\n");
@@ -3709,10 +3712,16 @@ static void _sde_crtc_set_suspend(struct drm_crtc *crtc, bool enable)
 	 * and take it back during resume (if it is still enabled).
 	 */
 	SDE_EVT32(DRMID(&sde_crtc->base), enable, sde_crtc->enabled,
-			sde_crtc->suspend);
+			sde_crtc->suspend, sde_crtc->vblank_requested);
 	if (sde_crtc->suspend == enable)
 		SDE_DEBUG("crtc%d suspend already set to %d, ignoring update\n",
 				crtc->base.id, enable);
+	else if (sde_crtc->enabled && sde_crtc->vblank_requested) {
+		ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, !enable);
+		if (ret)
+			SDE_ERROR("%s vblank enable failed: %d\n",
+					sde_crtc->name, ret);
+	}
 
 	sde_crtc->suspend = enable;
 	mutex_unlock(&sde_crtc->crtc_lock);
@@ -3772,11 +3781,14 @@ static void sde_crtc_reset(struct drm_crtc *crtc)
 	}
 
 	/* revert suspend actions, if necessary */
-	if (sde_kms_is_suspend_state(crtc->dev) &&
-		 !sde_crtc_is_reset_required(crtc)) {
+	if (sde_kms_is_suspend_state(crtc->dev)) {
+		_sde_crtc_set_suspend(crtc, false);
+
+		if (!sde_crtc_is_reset_required(crtc)) {
 			SDE_DEBUG("avoiding reset for crtc:%d\n",
 					crtc->base.id);
 			return;
+		}
 	}
 
 	/* remove previous state, if present */
@@ -3985,7 +3997,15 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
 	_sde_crtc_flush_event_thread(crtc);
 
 	SDE_EVT32(DRMID(crtc), sde_crtc->enabled, sde_crtc->suspend,
+			sde_crtc->vblank_requested,
 			crtc->state->active, crtc->state->enable);
+	if (sde_crtc->enabled && !sde_crtc->suspend &&
+			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_crtc->name, ret);
+	}
 	sde_crtc->enabled = false;
 
 	/* Try to disable uidle */
@@ -4097,7 +4117,8 @@ static void sde_crtc_enable(struct drm_crtc *crtc,
 	drm_crtc_vblank_on(crtc);
 
 	mutex_lock(&sde_crtc->crtc_lock);
-	SDE_EVT32(DRMID(crtc), sde_crtc->enabled, sde_crtc->suspend);
+	SDE_EVT32(DRMID(crtc), sde_crtc->enabled, sde_crtc->suspend,
+			sde_crtc->vblank_requested);
 
 	/*
 	 * Try to enable uidle (if possible), we do this before the call
@@ -4124,6 +4145,13 @@ static void sde_crtc_enable(struct drm_crtc *crtc,
 				sde_crtc_frame_event_cb, crtc);
 	}
 
+	if (!sde_crtc->enabled && !sde_crtc->suspend &&
+			sde_crtc->vblank_requested) {
+		ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, true);
+		if (ret)
+			SDE_ERROR("%s vblank enable failed: %d\n",
+					sde_crtc->name, ret);
+	}
 	sde_crtc->enabled = true;
 
 	/* update color processing on resume */
@@ -4716,13 +4744,14 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
 
 	mutex_lock(&sde_crtc->crtc_lock);
 	SDE_EVT32(DRMID(&sde_crtc->base), en, sde_crtc->enabled,
-			sde_crtc->suspend);
+			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;
 	mutex_unlock(&sde_crtc->crtc_lock);
 
 	return 0;
@@ -5436,6 +5465,8 @@ static int _sde_debugfs_status_show(struct seq_file *s, void *data)
 		sde_crtc->vblank_cb_time = ktime_set(0, 0);
 	}
 
+	seq_printf(s, "vblank_enable:%d\n", sde_crtc->vblank_requested);
+
 	mutex_unlock(&sde_crtc->crtc_lock);
 
 	return 0;
diff --git a/msm/sde/sde_crtc.h b/msm/sde/sde_crtc.h
index 2691364b1d..091f3da1f1 100644
--- a/msm/sde/sde_crtc.h
+++ b/msm/sde/sde_crtc.h
@@ -224,6 +224,7 @@ struct sde_crtc_misr_info {
  * @vblank_last_cb_time  : ktime at last vblank notification
  * @sysfs_dev  : sysfs device node for crtc
  * @vsync_event_sf : vsync event notifier sysfs device
+ * @vblank_requested : whether the user has requested vblank events
  * @suspend         : whether or not a suspend operation is in progress
  * @enabled       : whether the SDE CRTC is currently enabled. updated in the
  *                  commit-thread, not state-swap time which is earlier, so
@@ -293,6 +294,7 @@ struct sde_crtc {
 	struct sde_crtc_fps_info fps_info;
 	struct device *sysfs_dev;
 	struct kernfs_node *vsync_event_sf;
+	bool vblank_requested;
 	bool suspend;
 	bool enabled;