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

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

drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2) 



Some systems have LCD* rather than DFP* device tags in the bios
for eDP connectors; notably the new apple iMac. This fixes
things up so eDP connectors with either tag will work.

v2: fix typo

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

drivers/gpu/drm/radeon/atombios_crtc.c

+9 −4
Original line number Diff line number Diff line
@@ -581,12 +581,17 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
					}

				} else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

					/* may want to enable SS on DP/eDP eventually */

					/*args.v3.sInput.ucDispPllConfig |=

						DISPPLL_CONFIG_SS_ENABLE;*/

					if (encoder_mode == ATOM_ENCODER_MODE_DP)

						args.v3.sInput.ucDispPllConfig |=

						DISPPLL_CONFIG_SS_ENABLE;

							DISPPLL_CONFIG_COHERENT_MODE;

					else {

						if (mode->clock > 165000)

							args.v3.sInput.ucDispPllConfig |=

								DISPPLL_CONFIG_DUAL_LINK;

					}

				}

				atom_execute_table(rdev->mode_info.atom_context,

						   index, (uint32_t *)&args);

				adjusted_clock = le32_to_cpu(args.v3.sOutput.ulDispPllFreq) * 10;

drivers/gpu/drm/radeon/radeon_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, 
	}



	if (ASIC_IS_DCE3(rdev) &&

	    (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT))) {

	    (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT))) {

		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

		radeon_dp_set_link_config(connector, mode);

	}