xf86-video-ati: Branch 'pci-rework' - 2 commits

[George Sapountzis]

Rebased ref, commits from common ancestor:
diff-tree 2d2fb54ba370c1df9ef5102e83c17a7ff5c55403 (from cfb82631fb683a0dc9bbc8f2d214646a8f1bca0b)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Mar 15 17:26:56 2007 +0100

    atimisc: Fix strict aliasing violation flagged by -Wall.

diff --git a/src/atimach64render.c b/src/atimach64render.c
index 8a6ebbc..dda3938 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -769,7 +769,14 @@ do {                                    
     _v.argb = _col;                                             \
 } while (0)
 
-#define FVAL(_fval) (*(CARD32 *)&(_fval))
+static __inline__ CARD32
+FVAL(float f)
+{
+    union { float f; CARD32 c; } fc;
+
+    fc.f = f;
+    return fc.c;
+}
 
 #define VTX_OUT(_v, n)                    \
 do {                                      \
diff-tree cfb82631fb683a0dc9bbc8f2d214646a8f1bca0b (from 50a524445ed1ea3c4fab56de772921ba86a21d35)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Mar 15 17:12:43 2007 +0100

    radeon: Fix build warnings.

diff --git a/src/radeon.h b/src/radeon.h
index c976b0a..5bb005b 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -608,7 +608,7 @@ typedef struct {
 #endif
     Bool              have3DWindows;    /* Are there any 3d clients? */
 
-    unsigned int      pciAperSize;
+    int               pciAperSize;
     drmSize           gartSize;
     drm_handle_t         agpMemHandle;     /* Handle from drmAgpAlloc */
     unsigned long     gartOffset;
@@ -930,6 +930,7 @@ extern void        RADEONDRICloseScreen(
 extern void        RADEONDRIResume(ScreenPtr pScreen);
 extern Bool        RADEONDRIFinishScreenInit(ScreenPtr pScreen);
 extern void        RADEONDRIAllocatePCIGARTTable(ScreenPtr pScreen);
+extern int         RADEONDRIGetPciAperTableSize(ScrnInfoPtr pScrn);
 extern void        RADEONDRIStop(ScreenPtr pScreen);
 
 extern drmBufPtr   RADEONCPGetBuffer(ScrnInfoPtr pScrn);