xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

New commits:
diff-tree 9cd78af1d06f753e7bd7e1acaff25398bde45f6e (from 914a5f0117ccb76292bdd81ea4a2a79d33319550)
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Oct 23 16:52:07 2006 +1000

    radeon: set preferred modes

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 28a1672..163d19c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2088,7 +2088,10 @@ static DisplayModePtr RADEONDDCModes(Scr
 	    new->Clock      = d_timings->clock / 1000;
 	    new->Flags      = (d_timings->interlaced ? V_INTERLACE : 0);
 	    new->status     = MODE_OK;
-	    new->type       = M_T_DEFAULT;
+	    if (PREFERRED_TIMING_MODE(ddc->features.msc))
+	      new->type     = M_T_PREFERRED;
+	    else
+	      new->type     = M_T_DEFAULT;
 
 	    if (d_timings->sync == 3) {
 		switch (d_timings->misc) {
@@ -2444,6 +2447,9 @@ static int RADEONValidateFPModes(ScrnInf
 	new->Clock      = info->DotClock;
 	new->Flags     |= RADEON_USE_RMX;
 
+	if (width == info->PanelXRes && height == info->PanelYRes)
+	  new->type |= M_T_PREFERRED;
+
 	new->type      |= M_T_USERDEF;
 
 	new->next       = NULL;