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

Commit 2d1c18bb authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/radeon: only mark audio as connected if the monitor supports it (v3)" 

This breaks too many things.

bugs:
https://bugzilla.kernel.org/show_bug.cgi?id=99041
https://bugs.freedesktop.org/show_bug.cgi?id=90681

This reverts commit 0f55db36.

Cc: stable@vger.kernel.org
parent a10f0df0

drivers/gpu/drm/radeon/radeon_audio.c

+12 −15
Original line number Diff line number Diff line
@@ -460,9 +460,6 @@ void radeon_audio_detect(struct drm_connector *connector, 
	if (!connector || !connector->encoder)

		return;



	if (!radeon_encoder_is_digital(connector->encoder))

		return;



	rdev = connector->encoder->dev->dev_private;



	if (!radeon_audio_chipset_supported(rdev))
@@ -471,30 +468,30 @@ void radeon_audio_detect(struct drm_connector *connector, 
	radeon_encoder = to_radeon_encoder(connector->encoder);

	dig = radeon_encoder->enc_priv;



	if (!dig->afmt)

	if (status == connector_status_connected) {

		struct radeon_connector *radeon_connector;

		int sink_type;



		if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {

			radeon_encoder->audio = NULL;

			return;

		}



	if (status == connector_status_connected) {

		struct radeon_connector *radeon_connector = to_radeon_connector(connector);

		radeon_connector = to_radeon_connector(connector);

		sink_type = radeon_dp_getsinktype(radeon_connector);



		if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&

		    radeon_dp_getsinktype(radeon_connector) ==

		    CONNECTOR_OBJECT_ID_DISPLAYPORT)

			sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)

			radeon_encoder->audio = rdev->audio.dp_funcs;

		else

			radeon_encoder->audio = rdev->audio.hdmi_funcs;



		dig->afmt->pin = radeon_audio_get_pin(connector->encoder);

		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {

		radeon_audio_enable(rdev, dig->afmt->pin, 0xf);

	} else {

		radeon_audio_enable(rdev, dig->afmt->pin, 0);

		dig->afmt->pin = NULL;

	}

	} else {

		radeon_audio_enable(rdev, dig->afmt->pin, 0);

		dig->afmt->pin = NULL;

	}

}



void radeon_audio_fini(struct radeon_device *rdev)

drivers/gpu/drm/radeon/radeon_connectors.c

+2 −6
Original line number Diff line number Diff line
@@ -1379,10 +1379,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 
	/* updated in get modes as well since we need to know if it's analog or digital */

	radeon_connector_update_scratch_regs(connector, ret);



	if (radeon_audio != 0) {

		radeon_connector_get_edid(connector);

	if (radeon_audio != 0)

		radeon_audio_detect(connector, ret);

	}



exit:

	pm_runtime_mark_last_busy(connector->dev->dev);
@@ -1719,10 +1717,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 


	radeon_connector_update_scratch_regs(connector, ret);



	if (radeon_audio != 0) {

		radeon_connector_get_edid(connector);

	if (radeon_audio != 0)

		radeon_audio_detect(connector, ret);

	}



out:

	pm_runtime_mark_last_busy(connector->dev->dev);