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

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

drm/radeon: check for 0 count in speaker allocation and SAD code 

If there is no speaker allocation block or SAD block, bail
early.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=72283



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

drivers/gpu/drm/radeon/dce6_afmt.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



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

	if (sad_count < 0) {

	if (sad_count <= 0) {

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

		return;

	}
@@ -235,7 +235,7 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_sad(radeon_connector->edid, &sads);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read SADs: %d\n", sad_count);

		return;

	}

drivers/gpu/drm/radeon/evergreen_hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



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

	if (sad_count < 0) {

	if (sad_count <= 0) {

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

		return;

	}
@@ -173,7 +173,7 @@ static void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_sad(radeon_connector->edid, &sads);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read SADs: %d\n", sad_count);

		return;

	}