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

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

drm/radeon: use hw cts/n values for deep color 



I'm not really sure how these should be calculated
for deep color.  The hw generated values seem to work.

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

drivers/gpu/drm/radeon/evergreen_hdmi.c

+15 −3
Original line number Diff line number Diff line
@@ -293,10 +293,12 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode 
	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);

	u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];

	struct hdmi_avi_infoframe frame;

	uint32_t offset;

	ssize_t err;

	int bpc = 8;



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

		return;
@@ -306,6 +308,12 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode 
		return;

	offset = dig->afmt->offset;



	/* hdmi deep color mode general control packets setup, if bpc > 8 */

	if (encoder->crtc) {

		struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);

		bpc = radeon_crtc->bpc;

	}



	/* disable audio prior to setting up hw */

	if (ASIC_IS_DCE6(rdev)) {

		dig->afmt->pin = dce6_audio_get_pin(rdev);
@@ -348,6 +356,10 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode 


	/* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */



	if (bpc > 8)

		WREG32(HDMI_ACR_PACKET_CONTROL + offset,

		       HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */

	else

		WREG32(HDMI_ACR_PACKET_CONTROL + offset,

		       HDMI_ACR_SOURCE | /* select SW CTS value */

		       HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */