From edf1fe62a375cd3de4c0843194807ad6fae4e254 Mon Sep 17 00:00:00 2001 From: Wang Xingchao Date: Thu, 13 Sep 2012 11:19:00 +0800 Subject: [PATCH] --- yaml --- r: 329495 b: refs/heads/master c: 3cce574f0190dd149472059fb69267cf83d290f9 h: refs/heads/master i: 329493: 607b2fa4a81c5bcde3ca8c545f160ead4048ada3 329491: ef5c97f5340f91894b076d19c969d4bbcd069897 329487: ca8d1b8ce8d17c37cd86fa975a7579482f2ada16 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e377bdf9754b..7b9098d567ed 100644 --- 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 index 5d02aad0de8e..229897ff75da 100644 --- 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);