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

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

drm/radeon/kms: Add checks for TN in the DP bridge code 



TN (trinity) uses DP bridges for LVDS and VGA just like llano.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0671bdd7

drivers/gpu/drm/radeon/atombios_encoders.c

+4 −4
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder, 
	switch (mode) {

	case DRM_MODE_DPMS_ON:

	default:

		if (ASIC_IS_DCE41(rdev)) {

		if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) {

			atombios_external_encoder_setup(encoder, ext_encoder,

							EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT);

			atombios_external_encoder_setup(encoder, ext_encoder,
@@ -1449,7 +1449,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder, 
	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		if (ASIC_IS_DCE41(rdev)) {

		if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) {

			atombios_external_encoder_setup(encoder, ext_encoder,

							EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING);

			atombios_external_encoder_setup(encoder, ext_encoder,
@@ -1822,7 +1822,7 @@ radeon_atom_encoder_init(struct radeon_device *rdev) 
			break;

		}



		if (ext_encoder && ASIC_IS_DCE41(rdev))

		if (ext_encoder && (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)))

			atombios_external_encoder_setup(encoder, ext_encoder,

							EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT);

	}
@@ -1911,7 +1911,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
	}



	if (ext_encoder) {

		if (ASIC_IS_DCE41(rdev))

		if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev))

			atombios_external_encoder_setup(encoder, ext_encoder,

							EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP);

		else