---

yaml --- r: 336125 b: refs/heads/master c: ffe9955 h: refs/heads/master i: 336123: f52a1e5 v: v3
git-mirror · Nov 22, 2012 · 36ed8af · 36ed8af
1 parent 265dc40
commit 36ed8af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a39b49812fe0c3f62fd3f7f6ec8c10d8f7035992
+refs/heads/master: ffe9955a741a2742cc517245b2219b61cc6dde28
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -226,6 +226,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder)
 	 * already updated or not by exynos_drm_encoder_dpms function.
 	 */
 	exynos_encoder->updated = true;
+
+	/*
+	 * In case of setcrtc, there is no way to update encoder's dpms
+	 * so update it here.
+	 */
+	exynos_encoder->dpms = DRM_MODE_DPMS_ON;
 }
 
 static void exynos_drm_encoder_disable(struct drm_encoder *encoder)