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

Commit 28ed756f authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/radeon/audio: don't set speaker allocation on DCE4+" 

This reverts commit 555b1b65.

Let's try this again for 3.13.  It's required for proper
interaction with alsa.  Was disabled previously in 3.12
to be on the safe side since it caused problems on older
asics.
parent a2098250

drivers/gpu/drm/radeon/dce6_afmt.c

+0 −3
Original line number Diff line number Diff line
@@ -156,9 +156,6 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	u8 *sadb;

	int sad_count;



	/* XXX: setting this register causes hangs on some asics */

	return;



	if (!dig->afmt->pin)

		return;

drivers/gpu/drm/radeon/evergreen_hdmi.c

+0 −3
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	u8 *sadb;

	int sad_count;



	/* XXX: setting this register causes hangs on some asics */

	return;



	list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {

		if (connector->encoder == encoder) {

			radeon_connector = to_radeon_connector(connector);