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

Commit 38aef154 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: only enable audio streams if the monitor supports it 



Selectively enable which packets we send based on monitor caps.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 0f55db36

drivers/gpu/drm/radeon/atombios_encoders.c

+2 −4
Original line number Diff line number Diff line
@@ -1761,17 +1761,15 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

	int encoder_mode = atombios_get_encoder_mode(encoder);



	DRM_DEBUG_KMS("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",

		  radeon_encoder->encoder_id, mode, radeon_encoder->devices,

		  radeon_encoder->active_device);



	if (connector && (radeon_audio != 0) &&

	if ((radeon_audio != 0) &&

	    ((encoder_mode == ATOM_ENCODER_MODE_HDMI) ||

	     (ENCODER_MODE_IS_DP(encoder_mode) &&

	      drm_detect_monitor_audio(radeon_connector_edid(connector)))))

	     ENCODER_MODE_IS_DP(encoder_mode)))

		radeon_audio_dpms(encoder, mode);



	switch (radeon_encoder->encoder_id) {

drivers/gpu/drm/radeon/evergreen_hdmi.c

+19 −8
Original line number Diff line number Diff line
@@ -398,6 +398,9 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable) 
		return;



	if (enable) {

		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);



		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {

			WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,

			       HDMI_AVI_INFO_SEND | /* enable AVI info frames */

			       HDMI_AVI_INFO_CONT | /* required for audio info values to be updated */
@@ -405,6 +408,13 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable) 
			       HDMI_AUDIO_INFO_CONT); /* required for audio info values to be updated */

			WREG32_OR(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,

				  AFMT_AUDIO_SAMPLE_SEND);

		} else {

			WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,

			       HDMI_AVI_INFO_SEND | /* enable AVI info frames */

			       HDMI_AVI_INFO_CONT); /* required for audio info values to be updated */

			WREG32_AND(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,

				   ~AFMT_AUDIO_SAMPLE_SEND);

		}

	} else {

		WREG32_AND(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,

			   ~AFMT_AUDIO_SAMPLE_SEND);
@@ -423,11 +433,12 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);



	if (!dig || !dig->afmt)

		return;



	if (enable) {

	if (enable && drm_detect_monitor_audio(radeon_connector_edid(connector))) {

		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

		struct radeon_connector *radeon_connector = to_radeon_connector(connector);

		struct radeon_connector_atom_dig *dig_connector;