---

yaml --- r: 329495 b: refs/heads/master c: 3cce574 h: refs/heads/master i: 329493: 607b2fa 329491: ef5c97f 329487: ca8d1b8 v: v3
git-mirror · Sep 20, 2012 · edf1fe6 · edf1fe6
1 parent 5ef7ec5
commit edf1fe6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f745ad3d3ce96cb72d3981570d9e9988442bce8
+refs/heads/master: 3cce574f0190dd149472059fb69267cf83d290f9
diff --git a/trunk/drivers/gpu/drm/i915/intel_hdmi.c b/trunk/drivers/gpu/drm/i915/intel_hdmi.c
@@ -674,10 +674,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
 	u32 temp;
-	u32 enable_bits = SDVO_ENABLE;
-
-	if (intel_hdmi->has_audio)
-		enable_bits |= SDVO_AUDIO_ENABLE;
+	u32 enable_bits = SDVO_ENABLE | SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);