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

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

drm/radeon: drop dce6_dp_enable 



It's mostly duplicated with evergreen_dp_enable. This
is a prerequisite for fix implemented in another patch.

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

drivers/gpu/drm/radeon/dce6_afmt.c

+0 −25
Original line number Diff line number Diff line
@@ -295,28 +295,3 @@ void dce6_dp_audio_set_dto(struct radeon_device *rdev, 
		WREG32(DCCG_AUDIO_DTO1_MODULE, clock);

	}

}
 


void dce6_dp_enable(struct drm_encoder *encoder, bool enable)

{

	struct drm_device *dev = encoder->dev;

	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;



	if (!dig || !dig->afmt)

		return;



	if (enable) {

		WREG32(EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset,

		       EVERGREEN_DP_SEC_TIMESTAMP_MODE(1));

		WREG32(EVERGREEN_DP_SEC_CNTL + dig->afmt->offset,

		       EVERGREEN_DP_SEC_ASP_ENABLE |		/* Audio packet transmission */

		       EVERGREEN_DP_SEC_ATP_ENABLE |		/* Audio timestamp packet transmission */

		       EVERGREEN_DP_SEC_AIP_ENABLE |		/* Audio infoframe packet transmission */

		       EVERGREEN_DP_SEC_STREAM_ENABLE);	/* Master enable for secondary stream engine */

	} else {

		WREG32(EVERGREEN_DP_SEC_CNTL + dig->afmt->offset, 0);

	}



	dig->afmt->enabled = enable;

}

drivers/gpu/drm/radeon/evergreen_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable) 
		WREG32(EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset,

		       EVERGREEN_DP_SEC_TIMESTAMP_MODE(1));



		if (radeon_connector->con_priv) {

		if (!ASIC_IS_DCE6(rdev) && radeon_connector->con_priv) {

			dig_connector = radeon_connector->con_priv;

			val = RREG32(EVERGREEN_DP_SEC_AUD_N + dig->afmt->offset);

			val &= ~EVERGREEN_DP_SEC_N_BASE_MULTIPLE(0xf);

drivers/gpu/drm/radeon/radeon_audio.c

+1 −2
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder, 
void r600_hdmi_enable(struct drm_encoder *encoder, bool enable);

void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);

void evergreen_dp_enable(struct drm_encoder *encoder, bool enable);

void dce6_dp_enable(struct drm_encoder *encoder, bool enable);



static const u32 pin_offsets[7] =

{
@@ -240,7 +239,7 @@ static struct radeon_audio_funcs dce6_dp_funcs = { 
	.set_avi_packet = evergreen_set_avi_packet,

	.set_audio_packet = dce4_set_audio_packet,

	.mode_set = radeon_audio_dp_mode_set,

	.dpms = dce6_dp_enable,

	.dpms = evergreen_dp_enable,

};



static void radeon_audio_interface_init(struct radeon_device *rdev)