xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/radeon_display.c |    2 +-
 src/radeon_driver.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree c0660495080719c052d6393ede707755929102cd (from 5b98545618141e86164f3ce66469f9e16b1cf6d4)
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Sep 27 18:12:52 2006 +1000

    radeon: check DDC info for both connectors not just the pScrn one.
    
    Otherwise we disable DDC before we've checked the CRT if LVDS is in use

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f6198ba..db1ae66 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2768,7 +2768,7 @@ static Bool RADEONPreInitModes(ScrnInfoP
 	       "Validating modes on %s head ---------\n",
 	       info->IsSecondary ? "Secondary" : "Primary");
 
-    if (!pScrn->monitor->DDC && info->ddc_mode) {
+    if (!pRADEONEnt->Controller[0].pPort->MonInfo && !pRADEONEnt->Controller[1].pPort->MonInfo && info->ddc_mode) {
 	info->ddc_mode = FALSE;
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "No DDC data available, DDCMode option is dismissed\n");
diff-tree 5b98545618141e86164f3ce66469f9e16b1cf6d4 (from 74c725bd86348b5bf9bba0c50e8a6a7885d7ff7b)
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Sep 27 18:10:30 2006 +1000

    radeon: don't move connectors around if LVDS connector is connector 1
    
    On my laptop this allow me to plug or not plug a monitor without affecting
    my lvds

diff --git a/src/radeon_display.c b/src/radeon_display.c
index 791cdfe..8537da4 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -980,7 +980,7 @@ static void RADEONQueryConnectedDisplays
 	/* On my Inspiron 8600 both internal and external ports are
 	   marked DAC_PRIMARY in BIOS. So be extra careful - only
 	   swap when the first port is not DAC_PRIMARY */
-        if ( (pRADEONEnt->PortInfo[1].DACType == DAC_PRIMARY) &&
+        if ((!(pRADEONEnt->PortInfo[0].ConnectorType == CONNECTOR_PROPRIETARY)) &&  (pRADEONEnt->PortInfo[1].DACType == DAC_PRIMARY) &&
 	     (pRADEONEnt->PortInfo[0].DACType != DAC_PRIMARY)) {
             RADEONConnector connector;
             connector = pRADEONEnt->PortInfo[0];