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

drm/radeon: properly set dto for dp on DCE4/5



If DCPLL or ext PLL is used, use the disp clk.  If
PPLL is used, use the dp clock.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b20932dd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ void dce4_dp_audio_set_dto(struct radeon_device *rdev,
	 * is the numerator, DCCG_AUDIO_DTOx_MODULE is the denominator
	 */
	WREG32(DCCG_AUDIO_DTO1_PHASE, 24000);
	WREG32(DCCG_AUDIO_DTO1_MODULE, rdev->clock.max_pixel_clock * 10);
	WREG32(DCCG_AUDIO_DTO1_MODULE, clock);
}

void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset)
+8 −1
Original line number Diff line number Diff line
@@ -724,6 +724,10 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
	struct radeon_device *rdev = 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 = radeon_get_connector_for_encoder(encoder);
	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
	struct radeon_connector_atom_dig *dig_connector =
		radeon_connector->con_priv;

	if (!dig || !dig->afmt)
		return;
@@ -731,7 +735,10 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
	radeon_audio_write_speaker_allocation(encoder);
	radeon_audio_write_sad_regs(encoder);
	radeon_audio_write_latency_fields(encoder, mode);
	if (rdev->clock.dp_extclk || ASIC_IS_DCE5(rdev))
		radeon_audio_set_dto(encoder, rdev->clock.default_dispclk * 10);
	else
		radeon_audio_set_dto(encoder, dig_connector->dp_clock);
	radeon_audio_set_audio_packet(encoder);
	radeon_audio_select_pin(encoder);