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

Commit 6159b65a authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Alex Deucher
Browse files

drm/radeon: set speakers allocation earlier 



Do it before enabling audio channels (in AFMT_AUDIO_PACKET_CONTROL2
register).

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b530602f

drivers/gpu/drm/radeon/dce6_afmt.c

+48 −21
Original line number Diff line number Diff line
@@ -94,17 +94,62 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder) 
	WREG32(AFMT_AUDIO_SRC_CONTROL + offset, AFMT_AUDIO_SRC_SELECT(id));

}



void dce6_afmt_write_sad_regs(struct drm_encoder *encoder)

void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)

{

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

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector = NULL;

	u32 offset, tmp;

	u8 *sadb;

	int sad_count;



	if (!dig->afmt->pin)

		return;



	offset = dig->afmt->pin->offset;



	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_ENDPOINT(offset, AZ_F0_CODEC_PIN_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_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);



	kfree(sadb);

}



void dce6_afmt_write_sad_regs(struct drm_encoder *encoder)

{

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

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	u32 offset;

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector = NULL;

	struct cea_sad *sads;

	int i, sad_count, sadb_count;

	u8 *sadb;

	int i, sad_count;



	static const u16 eld_reg_to_type[][2] = {

		{ AZ_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR0, HDMI_AUDIO_CODING_TYPE_PCM },
@@ -143,23 +188,6 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder) 
	}

	BUG_ON(!sads);



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

	if (sadb_count < 0) {

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

		return;

	}



	/* program the speaker allocation */

	tmp = RREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER);

	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);

	/* set HDMI mode */

	tmp |= HDMI_CONNECTION;

	if (sadb_count)

		tmp |= SPEAKER_ALLOCATION(sadb[0]);

	else

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

	WREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);



	for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {

		u32 value = 0;

		int j;
@@ -180,7 +208,6 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder) 
	}



	kfree(sads);

	kfree(sadb);

}



static int dce6_audio_chipset_supported(struct radeon_device *rdev)

drivers/gpu/drm/radeon/evergreen_hdmi.c

+6 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "evergreend.h"

#include "atom.h"



extern void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder);

extern void dce6_afmt_write_sad_regs(struct drm_encoder *encoder);

extern void dce6_afmt_select_pin(struct drm_encoder *encoder);
@@ -267,7 +268,11 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode 
	       AFMT_60958_CS_CHANNEL_NUMBER_6(7) |

	       AFMT_60958_CS_CHANNEL_NUMBER_7(8));



	if (ASIC_IS_DCE6(rdev)) {

		dce6_afmt_write_speaker_allocation(encoder);

	} else {

		/* fglrx sets 0x0001005f | (x & 0x00fc0000) in 0x5f78 here */

	}



	WREG32(AFMT_AUDIO_PACKET_CONTROL2 + offset,

	       AFMT_AUDIO_CHANNEL_ENABLE(0xff));