Unverified Commit f378ab78 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Rodrigo Vivi
Browse files

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



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: cff742cc ("drm/i915: Hoist the encoder->audio_{enable,disable}() calls higher up")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240226193251.29619-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
(cherry picked from commit 315bd0a0)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 5acb32b1

drivers/gpu/drm/i915/display/g4x_dp.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/display/intel_sdvo.c

+0 −4
Original line number Diff line number Diff line
@@ -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