drm/i915/audio: move has_audio checks to within codec enable/disable

Reduce duplication.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220330094109.4164326-2-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index 55fefc9..16bb21a 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -495,9 +495,7 @@ static void intel_disable_dp(struct intel_atomic_state *state,
 
        intel_dp->link_trained = false;
 
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 
        /*
         * Make sure the panel is off before trying to change the mode.
@@ -692,8 +690,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,
        intel_dp_start_link_train(intel_dp, pipe_config);
        intel_dp_stop_link_train(intel_dp, pipe_config);
 
-       if (pipe_config->has_audio)
-               intel_audio_codec_enable(encoder, pipe_config, conn_state);
+       intel_audio_codec_enable(encoder, pipe_config, conn_state);
 }
 
 static void g4x_enable_dp(struct intel_atomic_state *state,

diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index 39ba5dc..8bfef08 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -143,16 +143,6 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
                             &pipe_config->infoframes.hdmi);
 }
 
-static void intel_enable_hdmi_audio(struct intel_encoder *encoder,
-                                   const struct intel_crtc_state *pipe_config,
-                                   const struct drm_connector_state *conn_state)
-{
-       struct drm_i915_private *i915 = to_i915(encoder->base.dev);
-
-       drm_WARN_ON(&i915->drm, !pipe_config->has_hdmi_sink);
-       intel_audio_codec_enable(encoder, pipe_config, conn_state);
-}
-
 static void g4x_enable_hdmi(struct intel_atomic_state *state,
                            struct intel_encoder *encoder,
                            const struct intel_crtc_state *pipe_config,
@@ -172,8 +162,9 @@ static void g4x_enable_hdmi(struct intel_atomic_state *state,
        intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
        intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
 
-       if (pipe_config->has_audio)
-               intel_enable_hdmi_audio(encoder, pipe_config, conn_state);
+       drm_WARN_ON(&dev_priv->drm, pipe_config->has_audio &&
+                   !pipe_config->has_hdmi_sink);
+       intel_audio_codec_enable(encoder, pipe_config, conn_state);
 }
 
 static void ibx_enable_hdmi(struct intel_atomic_state *state,
@@ -224,8 +215,9 @@ static void ibx_enable_hdmi(struct intel_atomic_state *state,
                intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
        }
 
-       if (pipe_config->has_audio)
-               intel_enable_hdmi_audio(encoder, pipe_config, conn_state);
+       drm_WARN_ON(&dev_priv->drm, pipe_config->has_audio &&
+                   !pipe_config->has_hdmi_sink);
+       intel_audio_codec_enable(encoder, pipe_config, conn_state);
 }
 
 static void cpt_enable_hdmi(struct intel_atomic_state *state,
@@ -278,8 +270,9 @@ static void cpt_enable_hdmi(struct intel_atomic_state *state,
                               intel_de_read(dev_priv, TRANS_CHICKEN1(pipe)) & ~TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);
        }
 
-       if (pipe_config->has_audio)
-               intel_enable_hdmi_audio(encoder, pipe_config, conn_state);
+       drm_WARN_ON(&dev_priv->drm, pipe_config->has_audio &&
+                   !pipe_config->has_hdmi_sink);
+       intel_audio_codec_enable(encoder, pipe_config, conn_state);
 }
 
 static void vlv_enable_hdmi(struct intel_atomic_state *state,
@@ -353,9 +346,7 @@ static void g4x_disable_hdmi(struct intel_atomic_state *state,
                             const struct intel_crtc_state *old_crtc_state,
                             const struct drm_connector_state *old_conn_state)
 {
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 
        intel_disable_hdmi(state, encoder, old_crtc_state, old_conn_state);
 }
@@ -365,9 +356,7 @@ static void pch_disable_hdmi(struct intel_atomic_state *state,
                             const struct intel_crtc_state *old_crtc_state,
                             const struct drm_connector_state *old_conn_state)
 {
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }
 
 static void pch_post_disable_hdmi(struct intel_atomic_state *state,

diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 24d2081..1c87bf6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -821,6 +821,9 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
        enum port port = encoder->port;
        enum pipe pipe = crtc->pipe;
 
+       if (!crtc_state->has_audio)
+               return;
+
        drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s][ENCODER:%d:%s] Enable audio codec on pipe %c, %u bytes ELD\n",
                    connector->base.id, connector->name,
                    encoder->base.base.id, encoder->base.name,
@@ -880,6 +883,9 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
        enum port port = encoder->port;
        enum pipe pipe = crtc->pipe;
 
+       if (!old_crtc_state->has_audio)
+               return;
+
        drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s][ENCODER:%d:%s] Disable audio codec on pipe %c\n",
                    connector->base.id, connector->name,
                    encoder->base.base.id, encoder->base.name, pipe);

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index dc208df..cec578e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2819,8 +2819,7 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state,
        if (!dig_port->lspcon.active || dig_port->dp.has_hdmi_sink)
                intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
 
-       if (crtc_state->has_audio)
-               intel_audio_codec_enable(encoder, crtc_state, conn_state);
+       intel_audio_codec_enable(encoder, crtc_state, conn_state);
 
        trans_port_sync_stop_link_train(state, encoder, crtc_state);
 }
@@ -2914,8 +2913,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,
        intel_de_write(dev_priv, DDI_BUF_CTL(port),
                       dig_port->saved_port_bits | DDI_BUF_CTL_ENABLE);
 
-       if (crtc_state->has_audio)
-               intel_audio_codec_enable(encoder, crtc_state, conn_state);
+       intel_audio_codec_enable(encoder, crtc_state, conn_state);
 }
 
 static void intel_enable_ddi(struct intel_atomic_state *state,
@@ -2956,9 +2954,7 @@ static void intel_disable_ddi_dp(struct intel_atomic_state *state,
 
        intel_dp->link_trained = false;
 
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 
        intel_psr_disable(intel_dp, old_crtc_state);
        intel_edp_backlight_off(old_conn_state);
@@ -2978,9 +2974,7 @@ static void intel_disable_ddi_hdmi(struct intel_atomic_state *state,
        struct drm_i915_private *i915 = to_i915(encoder->base.dev);
        struct drm_connector *connector = old_conn_state->connector;
 
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 
        if (!intel_hdmi_handle_sink_scrambling(encoder, connector,
                                               false, false))

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index e30e698..061b277 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -398,9 +398,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
        if (ret) {
                drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret);
        }
-       if (old_crtc_state->has_audio)
-               intel_audio_codec_disable(encoder,
-                                         old_crtc_state, old_conn_state);
+
+       intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }
 
 static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
@@ -599,8 +598,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
 
        intel_crtc_vblank_on(pipe_config);
 
-       if (pipe_config->has_audio)
-               intel_audio_codec_enable(encoder, pipe_config, conn_state);
+       intel_audio_codec_enable(encoder, pipe_config, conn_state);
 
        /* Enable hdcp if it's desired */
        if (conn_state->content_protection ==