Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 09:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
This commit is contained in:
Alex Deucher 2011-05-20 12:36:11 -04:00 committed by Dave Airlie
parent 6f15c506e0
commit 2307790f0c
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/gpu/drm/radeon/atombios_crtc.c
View File

@ -942,42 +942,24 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
case ATOM_ENCODER_MODE_DP: case ATOM_ENCODER_MODE_DP:
/* DP/eDP */ /* DP/eDP */
dp_clock = dig_connector->dp_clock / 10; dp_clock = dig_connector->dp_clock / 10;
if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) { if (ASIC_IS_DCE4(rdev))
if (ASIC_IS_DCE4(rdev)) { ss_enabled =
/* first try ASIC_INTERNAL_SS_ON_DP */ radeon_atombios_get_asic_ss_info(rdev, &ss,
ss_enabled = ASIC_INTERNAL_SS_ON_DP,
radeon_atombios_get_asic_ss_info(rdev, &ss, dp_clock);
ASIC_INTERNAL_SS_ON_DP, else {
dp_clock); if (dp_clock == 16200) {
if (!ss_enabled)
ss_enabled =
radeon_atombios_get_asic_ss_info(rdev, &ss,
dig->lcd_ss_id,
dp_clock);
} else
ss_enabled = ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev, &ss, radeon_atombios_get_ppll_ss_info(rdev, &ss,
dig->lcd_ss_id); ATOM_DP_SS_ID2);
} else { if (!ss_enabled)
if (ASIC_IS_DCE4(rdev))
ss_enabled =
radeon_atombios_get_asic_ss_info(rdev, &ss,
ASIC_INTERNAL_SS_ON_DP,
dp_clock);
else {
if (dp_clock == 16200) {
ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev, &ss,
ATOM_DP_SS_ID2);
if (!ss_enabled)
ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev, &ss,
ATOM_DP_SS_ID1);
} else
ss_enabled = ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev, &ss, radeon_atombios_get_ppll_ss_info(rdev, &ss,
ATOM_DP_SS_ID1); ATOM_DP_SS_ID1);
} } else
ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev, &ss,
ATOM_DP_SS_ID1);
} }
break; break;
case ATOM_ENCODER_MODE_LVDS: case ATOM_ENCODER_MODE_LVDS: