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

Commit 49104038 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix speaker allocation setup 



If the sad_count is 0, set the hw to stereo and change
the error message to a warn.  A lot of monitors don't
set the speaker allocation block.

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

drivers/gpu/drm/radeon/dce3_1_afmt.c

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) 


	sad_count = drm_edid_to_speaker_allocation(radeon_connector->edid, &sadb);

	if (sad_count < 0) {

		DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		return;

		DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		sad_count = 0;

	}



	/* program the speaker allocation */

drivers/gpu/drm/radeon/dce6_afmt.c

+3 −3
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_speaker_allocation(radeon_connector_edid(connector), &sadb);

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		return;

	if (sad_count < 0) {

		DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		sad_count = 0;

	}



	/* program the speaker allocation */

drivers/gpu/drm/radeon/evergreen_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_speaker_allocation(radeon_connector_edid(connector), &sadb);

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		return;

	if (sad_count < 0) {

		DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		sad_count = 0;

	}



	/* program the speaker allocation */