xf86-video-ati: Branch 'r6xx-r7xx-support'

[Alex Deucher]

 src/r600_textured_videofuncs.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e6475282486f4895bc68f6b093ecbb1aa6d25f72
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Feb 18 20:21:13 2009 -0500

    R6xx/R7xx Xv: fix some missing bits from last commit

diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index c2b0e75..f03fb7d 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -44,7 +44,7 @@
 
 #include "damage.h"
 
-void
+static void
 R600DoneTexturedVideo(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -462,7 +462,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     while (nBox--) {
 	int srcX, srcY, srcw, srch;
 	int dstX, dstY, dstw, dsth;
-	struct r6xx_copy_vertex *xv_vb = (pointer)((char*)accel_state->ib->address + (accel_state->ib->total / 2));
+	struct r6xx_copy_vertex *xv_vb;
 	struct r6xx_copy_vertex vertex[3];
 
 	if (((accel_state->vb_index + 3) * 16) > (accel_state->ib->total / 2)) {
@@ -471,6 +471,8 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 	    accel_state->ib = RADEONCPGetBuffer(pScrn);
 	}
 
+	xv_vb = (pointer)((char*)accel_state->ib->address + (accel_state->ib->total / 2));
+
 	dstX = pBox->x1 + dstxoff;
 	dstY = pBox->y1 + dstyoff;
 	dstw = pBox->x2 - pBox->x1;