From 9e8bb9216be7b4f99f773e5f28e571e7bd25164a Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 15 Apr 2012 13:59:35 +0200 Subject: [PATCH] drm/i915: enable sdvo encode dpms Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29441 Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6898145..f564115 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1119,8 +1119,8 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode) if (mode != DRM_MODE_DPMS_ON) { intel_sdvo_set_active_outputs(intel_sdvo, 0); - if (0) - intel_sdvo_set_encoder_power_state(intel_sdvo, mode); + + intel_sdvo_set_encoder_power_state(intel_sdvo, mode); if (mode == DRM_MODE_DPMS_OFF) { temp = I915_READ(intel_sdvo->sdvo_reg); @@ -1149,8 +1149,8 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode) "sync\n", SDVO_NAME(intel_sdvo)); } - if (0) - intel_sdvo_set_encoder_power_state(intel_sdvo, mode); + intel_sdvo_set_encoder_power_state(intel_sdvo, mode); + intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output); } return; -- 1.7.10