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

[Dave Airlie]

 src/radeon_driver.c |    2 +-
 src/radeon_probe.c  |    1 +
 src/radeon_video.c  |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
diff-tree 5cb20c2dc5eca9d7d7d78e9924ea1b90076e7253 (from 9d6261c024c697a211da4b6300420153eb72a264)
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Aug 23 18:46:41 2007 +1000

    radeon: bug 11899 + debian 435040 - test for usefbdev before calling int10
    (cherry picked from commit 3334c247540b113f9c4a5ce1879d8648a45a959a)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1f4d0c2..1d5cc36 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5852,7 +5852,7 @@ Bool RADEONEnterVT(int scrnIndex, int fl
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "RADEONEnterVT\n");
 
-    if (INREG(RADEON_CONFIG_MEMSIZE) == 0) { /* Softboot V_BIOS */
+    if (!info->FBDev && (INREG(RADEON_CONFIG_MEMSIZE) == 0)) { /* Softboot V_BIOS */
        xf86Int10InfoPtr pInt;
        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
                   "zero MEMSIZE, probably at D3cold. Re-POSTing via int10.\n");
diff-tree 9d6261c024c697a211da4b6300420153eb72a264 (from 7bc1f862bc5f992f213143fbafef52459ba7db4a)
Author: Roland Bär <roland at verifysoft.de>
Date:   Thu Aug 23 18:33:34 2007 +1000

    radeon: bug 11860 fix some mem leaks

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index d7ff643..c697f65 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -303,6 +303,7 @@ RADEONProbe(DriverPtr drv, int flags)
 		foundScreen          = TRUE;
 	    }
 
+            xfree(pEnt);
 	    pEnt = xf86GetEntityInfo(usedChips[i]);
 
             /* create a RADEONEntity for all chips, even with
diff-tree 7bc1f862bc5f992f213143fbafef52459ba7db4a (from 9d38c8aa1a7d6fb1af41ee8abdb4a95f94843538)
Author: Roland Bär <roland at verifysoft.de>
Date:   Thu Aug 23 18:37:35 2007 +1000

    radeon: bug 11861 - dead code removal in radeon_video.c
    (cherry picked from commit 8e3a6f83016cd8c4cfd43ceee4cbf0a8dc018b2a)

diff --git a/src/radeon_video.c b/src/radeon_video.c
index a38931c..7b85108 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -3444,7 +3444,8 @@ RADEONPutVideo(
    id = FOURCC_YUY2;
    
    top = ya>>16;
-
+#if 0
+   /* setting the ID above makes this useful - needs revisiting */
    switch(id) {
    case FOURCC_YV12:
    case FOURCC_I420:
@@ -3462,6 +3463,10 @@ RADEONPutVideo(
         srcPitch = (width<<1);
         break;
    }
+#else
+   dstPitch = ((width<<1) + 15) & ~15;
+   srcPitch = (width<<1);
+#endif
 
    new_size = dstPitch * height;
    new_size = new_size + 0x1f; /* for aligning */