drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally

[~andy/linux] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 5d02aad0de8ed1967c1a143d3fcb04874f2f8078..229897ff75da647ad40260edc23bfdab180d3319 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/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);