xf86-video-intel: 2 commits - src/sna/sna_driver.c

[Chris Wilson]

 src/sna/sna_driver.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0f15bfb190f8f4906f44f6d370dcc0a73ec4ba53
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 20 10:37:50 2015 +0000

    sna: Add missing include of DPMS constants
    
    Fixes build with slightly older X servers.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3c611a1..5b47bc7 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -57,6 +57,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <mi.h>
 #include <micmap.h>
 
+#if defined(HAVE_X11_EXTENSIONS_DPMSCONST_H)
+#include <X11/extensions/dpmsconst.h>
+#else
+#define DPMSModeOn 0
+#define DPMSModeOff 3
+#endif
+
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
commit 6da7993518db4149e8f2c9153a074a72ce15d616
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 20 10:39:56 2015 +0000

    sna: Finish e6227daff1e3e
    
    Missed the git-add before pushing. :|
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index cc233d7..3c611a1 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1419,8 +1419,7 @@ static void describe_sna(ScrnInfoPtr scrn)
 		   "SNA compiled: %s\n", BUILDER_DESCRIPTION);
 #endif
 #if HAS_DEBUG_FULL
-	ErrorF(scrn->scrnIndex, X_INFO,
-	       "SNA compiled with full debug logging; expect to run slowly\n");
+	ErrorF("SNA compiled with full debug logging; expect to run slowly\n");
 #endif
 #if !NDEBUG
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,