xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_modes.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree 032a00d155ecdcdcab3ca0d047f552fe6b338a97 (from 2632ae24b3b50c69567e92611ce7c2cd2ee98baa)
Author: airlied <airlied at optimus.localdomain>
Date:   Sat Nov 18 10:23:12 2006 +1100

    make DDC function more generic

diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index cf8ab89..70bf184 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -141,7 +141,7 @@ void RADEONSetPitch (ScrnInfoPtr pScrn)
 /* When no mode provided in config file, this will add all modes supported in
  * DDC date the pScrn->modes list
  */
-static DisplayModePtr RADEONDDCModes(ScrnInfoPtr pScrn)
+static DisplayModePtr RADEONDDCModes(ScrnInfoPtr pScrn, xf86MonPtr ddc)
 {
     DisplayModePtr  p;
     DisplayModePtr  last  = NULL;
@@ -150,7 +150,6 @@ static DisplayModePtr RADEONDDCModes(Scr
     int             count = 0;
     int             j, tmp;
     char            stmp[32];
-    xf86MonPtr      ddc   = pScrn->monitor->DDC;
 
     /* Go thru detailed timing table first */
     for (j = 0; j < 4; j++) {
@@ -302,7 +301,7 @@ int RADEONValidateDDCModes(ScrnInfoPtr p
 	int  maxVirtY = pScrn->virtualY;
 
 	/* Collect all of the DDC modes */
-	first = last = ddcModes = RADEONDDCModes(pScrn);
+	first = last = ddcModes = RADEONDDCModes(pScrn, pScrn->monitor->DDC);
 
 	for (p = ddcModes; p; p = p->next) {