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

Commit d07f4e83 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: dvo dpms updates for DCE5 



The DVOOutputControl table was removed for DCE5.
DVOEncoderControl now handles everything.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 69c74525

drivers/gpu/drm/radeon/radeon_encoders.c

+15 −1
Original line number Diff line number Diff line
@@ -1228,6 +1228,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
	int index = 0;

	bool is_dig = false;

	bool is_dce5_dac = false;

	bool is_dce5_dvo = false;



	memset(&args, 0, sizeof(args));
@@ -1250,7 +1251,9 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
		index = GetIndexIntoMasterTable(COMMAND, DVOOutputControl);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:

		if (ASIC_IS_DCE3(rdev))

		if (ASIC_IS_DCE5(rdev))

			is_dce5_dvo = true;

		else if (ASIC_IS_DCE3(rdev))

			is_dig = true;

		else

			index = GetIndexIntoMasterTable(COMMAND, DVOOutputControl);
@@ -1345,6 +1348,17 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
			atombios_dac_setup(encoder, ATOM_DISABLE);

			break;

		}

	} else if (is_dce5_dvo) {

		switch (mode) {

		case DRM_MODE_DPMS_ON:

			atombios_dvo_setup(encoder, ATOM_ENABLE);

			break;

		case DRM_MODE_DPMS_STANDBY:

		case DRM_MODE_DPMS_SUSPEND:

		case DRM_MODE_DPMS_OFF:

			atombios_dvo_setup(encoder, ATOM_DISABLE);

			break;

		}

	} else {

		switch (mode) {

		case DRM_MODE_DPMS_ON: