summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-03-26 01:38:36 -0400
committerAlex Deucher <alexdeucher@gmail.com>2010-03-26 01:38:36 -0400
commitc7eeda8c3f3514ba95ebf2893fbe124bf526b3df (patch)
treee7b73ca37363f456155b02b458e79cf5e3fe1cdf
parentff323e11485fa5030ac278c836bf80a535c22249 (diff)
radeon: add support eDP connectors with and LCD device tag
should fix fdo bug 27322
-rw-r--r--src/radeon_output.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 16b34060..8648f278 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -181,6 +181,10 @@ radeon_set_active_device(xf86OutputPtr output)
radeon_output->active_device = ATOM_DEVICE_DFP4_SUPPORT;
else if (radeon_output->devices & ATOM_DEVICE_DFP5_SUPPORT)
radeon_output->active_device = ATOM_DEVICE_DFP5_SUPPORT;
+ else if (radeon_output->devices & ATOM_DEVICE_LCD1_SUPPORT)
+ radeon_output->active_device = ATOM_DEVICE_LCD1_SUPPORT;
+ else if (radeon_output->devices & ATOM_DEVICE_LCD2_SUPPORT)
+ radeon_output->active_device = ATOM_DEVICE_LCD2_SUPPORT;
break;
case MT_CRT:
if (radeon_output->devices & ATOM_DEVICE_CRT1_SUPPORT)
@@ -383,7 +387,8 @@ radeon_ddc_connected(xf86OutputPtr output)
*/
ret = RADEON_DP_GetSinkType(output);
- if (ret == CONNECTOR_OBJECT_ID_DISPLAYPORT) {
+ if ((ret == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+ (ret == CONNECTOR_OBJECT_ID_eDP)) {
MonType = MT_DP;
RADEON_DP_GetDPCD(output);
} else