Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcb1704 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dp: there is no audio on port A 

The eDP port A register on PCH split platforms has a slightly different
register layout from the other ports, with bit 6 being either alternate
scrambler reset or reserved, depending on the generation. Our
misinterpretation of the bit as audio has lead to warning.

Fix this by not enabling audio on port A, since none of our platforms
support audio on port A anyway.

v2: DDI doesn't have audio on port A either (Sivakumar Thulasimani)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89958


Reported-and-tested-by: default avatarChris Bainbridge <chris.bainbridge@gmail.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarSivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3916e3fd

drivers/gpu/drm/i915/intel_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, 


	pipe_config->has_dp_encoder = true;

	pipe_config->has_drrs = false;

	pipe_config->has_audio = intel_dp->has_audio;

	pipe_config->has_audio = intel_dp->has_audio && port != PORT_A;



	if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {

		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -2211,8 +2211,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 
	int dotclock;



	tmp = I915_READ(intel_dp->output_reg);

	if (tmp & DP_AUDIO_OUTPUT_ENABLE)

		pipe_config->has_audio = true;



	pipe_config->has_audio = tmp & DP_AUDIO_OUTPUT_ENABLE && port != PORT_A;



	if ((port == PORT_A) || !HAS_PCH_CPT(dev)) {

		if (tmp & DP_SYNC_HS_HIGH)