[PATCH 1/2] drm/i915: Stop doing double audio enable/disable on SDVO and g4x+ DP

[Jani Nikula]

On Mon, 26 Feb 2024, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Looks like I misplaced a few hunks when I moved the audio
> enable/disable out from the encoder enable/disable hooks.
> So we are now doing a double audio enable/disable on SDVO
> and g4x+ DP. Probably harmless as doing it twice shouldn't
> really change anything, but let's do it just once, as intended.
>
> Fixes: cff742cc6851 ("drm/i915: Hoist the encoder->audio_{enable,disable}() calls higher up")
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Hrmh, I'll scold the reviewer next time I look in the mirror.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  drivers/gpu/drm/i915/display/g4x_dp.c     | 2 --
>  drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ----
>  2 files changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index dfe0b07a122d..06ec04e667e3 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -717,7 +717,6 @@ static void g4x_enable_dp(struct intel_atomic_state *state,
>  {
>  	intel_enable_dp(state, encoder, pipe_config, conn_state);
>  	intel_edp_backlight_on(pipe_config, conn_state);
> -	encoder->audio_enable(encoder, pipe_config, conn_state);
>  }
>  
>  static void vlv_enable_dp(struct intel_atomic_state *state,
> @@ -726,7 +725,6 @@ static void vlv_enable_dp(struct intel_atomic_state *state,
>  			  const struct drm_connector_state *conn_state)
>  {
>  	intel_edp_backlight_on(pipe_config, conn_state);
> -	encoder->audio_enable(encoder, pipe_config, conn_state);
>  }
>  
>  static void g4x_pre_enable_dp(struct intel_atomic_state *state,
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 5f9e748adc89..0cd9c183f621 100644
> --- 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

-- 
Jani Nikula, Intel