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

[Alex Deucher]

 src/radeon_video.c |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

New commits:
diff-tree d5cf268be2c9b3e320d7101f5213f7d5609b6308 (from 8aca0ca6be7122e0ece20985a1862553a1b225c0)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 22 18:31:51 2007 -0400

    RADEON: Fix crash when Xv window is outside of either crtc

diff --git a/src/radeon_video.c b/src/radeon_video.c
index 271f7fe..dca9695 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2907,6 +2907,15 @@ RADEONPutImage(
 				 clipBoxes, width, height))
        return Success;
 
+   if (!crtc) {
+       if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
+	   unsigned char *RADEONMMIO = info->MMIO;
+	   OUTREG(RADEON_OV0_SCALE_CNTL, 0);
+	   pPriv->videoStatus &= ~CLIENT_VIDEO_ON;
+       }
+       return Success;
+   }
+
    dstBox.x1 -= crtc->x;
    dstBox.x2 -= crtc->x;
    dstBox.y1 -= crtc->y;
@@ -3285,6 +3294,15 @@ RADEONDisplaySurface(
 				  surface->width, surface->height))
         return Success;
 
+   if (!crtc) {
+       if (pPriv->isOn) {
+	   unsigned char *RADEONMMIO = info->MMIO;
+	   OUTREG(RADEON_OV0_SCALE_CNTL, 0);
+	   pPriv->isOn = FALSE;
+       }
+       return Success;
+   }
+
     dstBox.x1 -= crtc->x;
     dstBox.x2 -= crtc->x;
     dstBox.y1 -= crtc->y;
@@ -3419,6 +3437,15 @@ RADEONPutVideo(
 				 clipBoxes, width, height))
        return Success;
 
+   if (!crtc) {
+       if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
+	   unsigned char *RADEONMMIO = info->MMIO;
+	   OUTREG(RADEON_OV0_SCALE_CNTL, 0);
+	   pPriv->videoStatus &= ~CLIENT_VIDEO_ON;
+       }
+       return Success;
+   }
+
    dstBox.x1 -= crtc->x;
    dstBox.x2 -= crtc->x;
    dstBox.y1 -= crtc->y;
diff-tree 8aca0ca6be7122e0ece20985a1862553a1b225c0 (from d6e1d9be1cd5786a24ed4bb8e45fa7e04df56622)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 22 17:56:50 2007 -0400

    Revert "RADEON: fix crash when Xv window is outside of either crtc"
    
    This reverts commit 9109e62e3be7f96b41b534ab517fdf1baf458806.
    
    This breaks ABI.  better fix to come.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index bbd743b..271f7fe 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -215,8 +215,7 @@ radeon_clip_video_helper(ScrnInfoPtr pSc
 	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);
 	    crtc_region = &crtc_region_local;
 	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);
-	} else
-	    return FALSE;
+	}
 	*crtc_ret = crtc;
     }