xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c7eeda8c3f3514ba95ebf2893fbe124bf526b3df
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Mar 26 01:38:36 2010 -0400

    radeon: add support eDP connectors with and LCD device tag
    
    should fix fdo bug 27322

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 16b3406..8648f27 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