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

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

drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only 



For DP/eDP, always use the standard DP SS indices.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 6f15c506

drivers/gpu/drm/radeon/atombios_crtc.c

+12 −30
Original line number Diff line number Diff line
@@ -942,23 +942,6 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode 
		case ATOM_ENCODER_MODE_DP:

			/* DP/eDP */

			dp_clock = dig_connector->dp_clock / 10;

			if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {

				if (ASIC_IS_DCE4(rdev)) {

					/* first try ASIC_INTERNAL_SS_ON_DP */

					ss_enabled =

						radeon_atombios_get_asic_ss_info(rdev, &ss,

										 ASIC_INTERNAL_SS_ON_DP,

										 dp_clock);

					if (!ss_enabled)

						ss_enabled =

							radeon_atombios_get_asic_ss_info(rdev, &ss,

											 dig->lcd_ss_id,

											 dp_clock);

				} else

					ss_enabled =

						radeon_atombios_get_ppll_ss_info(rdev, &ss,

										 dig->lcd_ss_id);

			} else {

			if (ASIC_IS_DCE4(rdev))

				ss_enabled =

					radeon_atombios_get_asic_ss_info(rdev, &ss,
@@ -978,7 +961,6 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode 
						radeon_atombios_get_ppll_ss_info(rdev, &ss,

										 ATOM_DP_SS_ID1);

			}

			}

			break;

		case ATOM_ENCODER_MODE_LVDS:

			if (ASIC_IS_DCE4(rdev))