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

[Michel Dänzer]

 src/drmmode_display.c    |    1 -
 src/drmmode_display.h    |    4 ++--
 src/radeon_commonfuncs.c |    1 -
 src/radeon_dri2.c        |    2 ++
 src/radeon_exa.c         |   12 +++---------
 src/radeon_probe.c       |    5 +++++
 6 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 2a622168606d98c404708b879e6417c8f7d7305c
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Jul 2 15:03:53 2009 +0200

    Test BO pointer before passing it to radeon_bo_unref().

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index b28f726..ca4eda0 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -405,7 +405,8 @@ static void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
     if (!driverPriv)
       return;
 
-    radeon_bo_unref(driver_priv->bo);
+    if (driver_priv->bo)
+	radeon_bo_unref(driver_priv->bo);
     xfree(driverPriv);
 }
 
commit 36a4ea5a9c7062f4c8aa7480bb7488ce2062390f
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Jul 2 14:52:44 2009 +0200

    Warning fixes.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 644727d..b5846df 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -302,7 +302,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		/* go through all the outputs and force DPMS them back on? */
 		for (i = 0; i < xf86_config->num_output; i++) {
 			xf86OutputPtr output = xf86_config->output[i];
-			drmmode_output_private_ptr drmmode_output;
 
 			if (output->crtc != crtc)
 				continue;
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index b8f921d..2713bab 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -35,7 +35,7 @@
 
 typedef struct {
   int fd;
-  int fb_id;
+  unsigned fb_id;
   drmModeResPtr mode_res;
   drmModeFBPtr mode_fb;
   int cpp;
@@ -48,7 +48,7 @@ typedef struct {
     drmModeCrtcPtr mode_crtc;
     struct radeon_bo *cursor_bo;
     struct radeon_bo *rotate_bo;
-    int rotate_fb_id;
+    unsigned rotate_fb_id;
     uint16_t lut_r[256], lut_g[256], lut_b[256];
 } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr;
 
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index f2554bb..3df7daf 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -831,7 +831,6 @@ void drmmode_wait_for_vline(ScrnInfoPtr pScrn, PixmapPtr pPix,
 {
     RADEONInfoPtr  info = RADEONPTR(pScrn);
     xf86CrtcConfigPtr  xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    uint32_t offset;
     drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[crtc]->driver_private;
     ACCEL_PREAMBLE();
 
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index f43490e..37b47fe 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -40,6 +40,8 @@
 
 #ifdef RADEON_DRI2
 
+#include "radeon_bo_gem.h"
+
 #if DRI2INFOREC_VERSION >= 1
 #define USE_DRI2_1_1_0
 #endif
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 9444da3..b28f726 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -334,7 +334,7 @@ static void RADEONFinishAccess_BE(PixmapPtr pPix, int index)
 #ifdef XF86DRM_MODE
 static Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
 {
-    RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
     struct radeon_exa_pixmap_priv *driver_priv;
     int ret;
 
@@ -400,8 +400,6 @@ void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align)
 
 static void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    RADEONInfoPtr info = RADEONPTR(pScrn);
     struct radeon_exa_pixmap_priv *driver_priv = driverPriv;
 
     if (!driverPriv)
@@ -413,8 +411,6 @@ static void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
 
 struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-    RADEONInfoPtr info = RADEONPTR(pScrn);
     struct radeon_exa_pixmap_priv *driver_priv;
     driver_priv = exaGetPixmapDriverPrivate(pPix);
     return driver_priv->bo;
@@ -422,9 +418,6 @@ struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix)
 
 void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-    RADEONInfoPtr info = RADEONPTR(pScrn);
-
     struct radeon_exa_pixmap_priv *driver_priv;
 
     driver_priv = exaGetPixmapDriverPrivate(pPix);
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index cf7981f..78dee85 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -47,6 +47,11 @@
 #include "xf86.h"
 #include "xf86Resources.h"
 
+#ifdef XF86DRM_MODE
+#include "xf86drmMode.h"
+#include "dri.h"
+#endif
+
 #include "radeon_chipset_gen.h"
 
 #include "radeon_pci_chipset_gen.h"