xf86-video-ati: Branch 'master'

[Adam Jackson]

 configure.ac      |    4 ++--
 src/r128_driver.c |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
diff-tree f96ddd32d3a9e64dc0adec5c50386d6db5b182ee (from f6b42149c5a3fee663575fe6bbe78b62695bdbc8)
Author: Ronald Wahl <rwahl at gmx.de>
Date:   Fri Sep 29 17:51:42 2006 -0400

    Hook up DFP power to DPMS events.

diff --git a/configure.ac b/configure.ac
index a7cdd10..ddb9dca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.6.2,
+        6.6.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 AC_DEFINE_UNQUOTED([ATI_VERSION_MAJOR],
@@ -135,7 +135,7 @@ case $host_cpu in
     ATIMISC_TV_OUT=yes
     ATIMISC_CPIO=yes
     ;;
-  x86_64|amd64|alpha|ia64)
+  x86_64|amd64|alpha)
     ATIMISC_CPIO=yes
     ;;
   sparc)
diff --git a/src/r128_driver.c b/src/r128_driver.c
index adf6449..81c9015 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -4522,6 +4522,18 @@ static void R128DisplayPowerManagementSe
 		OUTREGP(R128_CRTC_EXT_CNTL, mask, ~mask);
 	break;
     }
+    if(info->isDFP) {
+	switch (PowerManagementMode) {
+	case DPMSModeOn:
+	    OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) | (R128_FP_FPON | R128_FP_TDMS_EN));
+	    break;
+	case DPMSModeStandby:
+	case DPMSModeSuspend:
+	case DPMSModeOff:
+	    OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) & ~(R128_FP_FPON | R128_FP_TDMS_EN));
+	    break;
+	}
+    }
 }
 
 static int r128_set_backlight_enable(ScrnInfoPtr pScrn, int on);