From 36ed8af3c82241431dd44ff85239820a6a603121 Mon Sep 17 00:00:00 2001 From: Inki Dae Date: Wed, 14 Nov 2012 20:41:35 +0900 Subject: [PATCH] --- yaml --- r: 336125 b: refs/heads/master c: ffe9955a741a2742cc517245b2219b61cc6dde28 h: refs/heads/master i: 336123: f52a1e530746ebbf822a50240bb4d9e386ebb4ed v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab0b9e097542..e20ccadfd00a 100644 --- 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 index 241ad1eeec64..607231a71b2d 100644 --- 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)