---

yaml --- r: 323040 b: refs/heads/master c: b98b601 h: refs/heads/master v: v3
git-mirror · Sep 17, 2012 · b197144 · b197144
1 parent 0fe58be
commit b197144
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e81a42e341a4f15d76624b7c02ffb21b085b56f
+refs/heads/master: b98b60167279df3acac9422c3c9820d9ebbcf9fb
diff --git a/trunk/drivers/gpu/drm/i915/intel_hdmi.c b/trunk/drivers/gpu/drm/i915/intel_hdmi.c
@@ -609,7 +609,7 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
 	u32 temp;
 	u32 enable_bits = SDVO_ENABLE;
 
-	if (intel_hdmi->has_audio)
+	if (intel_hdmi->has_audio || mode != DRM_MODE_DPMS_ON)
 		enable_bits |= SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);