G80: Allow DVI scaling.

Revamp how the scaling code works.  When a mode is set on a DVI output,
determine the current preferred mode and scale to that.  Add a new scaling
option, "off", which disables scaling and scans out the actual timings in the
mode to be set.

1 files changed, 3 insertions, 7 deletions

diff --git a/src/g80_output.c b/src/g80_output.c
index 448864f..8bd2096 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -29,6 +29,7 @@
 #include <strings.h>
 
 #include "g80_type.h"
+#include "g80_display.h"
 #include "g80_output.h"
 
 static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
@@ -173,13 +174,6 @@ G80OutputModeValid(xf86OutputPtr output, DisplayModePtr mode)
     return MODE_OK;
 }
 
-Bool
-G80OutputModeFixup(xf86OutputPtr output, DisplayModePtr mode,
-                   DisplayModePtr adjusted_mode)
-{
-    return TRUE;
-}
-
 void
 G80OutputPrepare(xf86OutputPtr output)
 {
@@ -329,12 +323,14 @@ G80CreateOutputs(ScrnInfoPtr pScrn)
 
             pPriv->partner = sor;
             pPriv->i2c = i2c;
+            pPriv->scale = G80_SCALE_OFF;
         }
         if(sor) {
             G80OutputPrivPtr pPriv = sor->driver_private;
 
             pPriv->partner = dac;
             pPriv->i2c = i2c;
+            pPriv->scale = G80_SCALE_ASPECT;
         }
     }