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

Commit 0ffae60c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: set speaker allocation for DCE3.2 



This updates the audio driver to the speaker allocation
block from the EDID.  A similar change was just implemented
for DCE4-8.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ba7def4f

drivers/gpu/drm/radeon/r600_hdmi.c

+42 −0
Original line number Diff line number Diff line
@@ -283,6 +283,45 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 
	}

}



static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)

{

	struct radeon_device *rdev = encoder->dev->dev_private;

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector = NULL;

	u32 tmp;

	u8 *sadb;

	int sad_count;



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

		if (connector->encoder == encoder)

			radeon_connector = to_radeon_connector(connector);

	}



	if (!radeon_connector) {

		DRM_ERROR("Couldn't find encoder's connector\n");

		return;

	}



	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;

	}



	/* program the speaker allocation */

	tmp = RREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER);

	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);

	/* set HDMI mode */

	tmp |= HDMI_CONNECTION;

	if (sad_count)

		tmp |= SPEAKER_ALLOCATION(sadb[0]);

	else

		tmp |= SPEAKER_ALLOCATION(5); /* stereo */

	WREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER, tmp);



	kfree(sadb);

}



/*

 * update the info frames with the data from the current display mode

 */
@@ -327,6 +366,9 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod 
		       HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */

	}



	if (ASIC_IS_DCE32(rdev))

		dce3_2_afmt_write_speaker_allocation(encoder);



	WREG32(HDMI0_ACR_PACKET_CONTROL + offset,

	       HDMI0_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */

	       HDMI0_ACR_SOURCE); /* select SW CTS value */

drivers/gpu/drm/radeon/r600d.h

+7 −0
Original line number Diff line number Diff line
@@ -960,6 +960,13 @@ 
#       define DIG_MODE_SDVO             4

#define DIG1_CNTL                        0x79a0



#define AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER          0x71bc

#define		SPEAKER_ALLOCATION(x)			(((x) & 0x7f) << 0)

#define		SPEAKER_ALLOCATION_MASK			(0x7f << 0)

#define		SPEAKER_ALLOCATION_SHIFT		0

#define		HDMI_CONNECTION				(1 << 16)

#define		DP_CONNECTION				(1 << 17)



/* rs6xx/rs740 and r6xx share the same HDMI blocks, however, rs6xx has only one

 * instance of the blocks while r6xx has 2.  DCE 3.0 cards are slightly

 * different due to the new DIG blocks, but also have 2 instances.