drm/i915: Stop doing double audio enable/disable on SDVO and g4x+ DP

[thirdparty/linux.git] / drivers / gpu / drm / i915 / display / intel_sdvo.c

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 5f9e748adc89ee846de12974195e17ab38e14b21..0cd9c183f6212ff55b3b6902df1ef752dc54f5ee 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -1842,8 +1842,6 @@ static void intel_disable_sdvo(struct intel_atomic_state *state,
        struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
        u32 temp;
 
-       encoder->audio_disable(encoder, old_crtc_state, conn_state);
-
        intel_sdvo_set_active_outputs(intel_sdvo, 0);
        if (0)
                intel_sdvo_set_encoder_power_state(intel_sdvo,
@@ -1935,8 +1933,6 @@ static void intel_enable_sdvo(struct intel_atomic_state *state,
                intel_sdvo_set_encoder_power_state(intel_sdvo,
                                                   DRM_MODE_DPMS_ON);
        intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo_connector->output_flag);
-
-       encoder->audio_enable(encoder, pipe_config, conn_state);
 }
 
 static enum drm_mode_status