xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/atombios_crtc.c |    2 +-
 src/radeon_accel.c  |    1 +
 src/radeon_crtc.c   |    2 ++
 src/radeon_driver.c |    2 ++
 src/radeon_probe.c  |    1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 035f7f3ab529ca19b853066792af8a23d08a0f53
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 1 10:23:14 2010 +1000

    radeon: add some missing math.h and assert.h includes

diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index 651b3d7..8b89bcd 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -40,7 +40,7 @@
 #include <X11/extensions/dpms.h>
 #endif
 
-
+#include <math.h>
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_macros.h"
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 1e20e56..1cebcf6 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -75,6 +75,7 @@
 
 #include <errno.h>
 #include <string.h>
+#include <assert.h>
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_reg.h"
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 550bd39..d84112e 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -32,6 +32,8 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <assert.h>
+#include <math.h>
 
 /* X and server generic header files */
 #include "xf86.h"
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 4405d40..7819027 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 /*
  * Authors:
commit 0f924e83d7be6fca7e024acdf973089efdf3b627
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 1 10:23:33 2010 +1000

    radeon: make sure EXA is off when EXA is disabled with --disable-exa

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 3900b09..38d5347 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2215,6 +2215,8 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 #else /* USE_XAA */
 	info->useEXA = TRUE;
 #endif /* !USE_XAA */
+#else
+	info->useEXA = FALSE;
 #endif /* USE_EXA */
         if (info->ChipFamily < CHIP_FAMILY_R600)
 	    xf86DrvMsg(pScrn->scrnIndex, from,