xf86-video-r128: Branch 'master'

[Connor Behan]

 src/r128_crtc.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 539320429ff1cf8918862da3f950c8740ba63ec4
Author: Connor Behan <connor.behan at gmail.com>
Date:   Fri Jul 4 12:44:30 2014 -0700

    Only enable CRTCs for DPMSModeOn
    
    This was suggested as a power saving tip.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 35e1fee..8a6ec44 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -84,6 +84,20 @@ static void r128_crtc_dpms(xf86CrtcPtr crtc, int mode)
         break;
     }
 
+    if (mode != DPMSModeOn) {
+        if (r128_crtc->crtc_id) {
+            OUTREGP(R128_CRTC2_GEN_CNTL, 0, ~R128_CRTC2_EN);
+        } else {
+            OUTREGP(R128_CRTC_GEN_CNTL, 0, ~R128_CRTC_EN);
+        }
+    } else {
+        if (r128_crtc->crtc_id) {
+            OUTREGP(R128_CRTC2_GEN_CNTL, R128_CRTC2_EN, ~R128_CRTC2_EN);
+        } else {
+            OUTREGP(R128_CRTC_GEN_CNTL, R128_CRTC_EN, ~R128_CRTC_EN);
+        }
+    }
+
     if (mode != DPMSModeOff)
         r128_crtc_load_lut(crtc);
 }