rpms/xorg-x11-drv-ati/devel radeon-6.11.0-git.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 radeon-modeset.patch, 1.31, 1.32 radeon.xinf, 1.10, 1.11 sources, 1.25, 1.26 xorg-x11-drv-ati.spec, 1.149, 1.150 radeon-fix-rs780-mm.patch, 1.1, NONE radeon-mode-fix-rotate.patch, 1.2, NONE radeon-modeset-fix-legacy-vt.patch, 1.1, NONE

Dave Airlie airlied at fedoraproject.org
Fri Feb 27 03:58:03 UTC 2009


Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27431

Modified Files:
	.cvsignore radeon-modeset.patch radeon.xinf sources 
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.11.0-git.patch 
Removed Files:
	radeon-fix-rs780-mm.patch radeon-mode-fix-rotate.patch 
	radeon-modeset-fix-legacy-vt.patch 
Log Message:
* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com> 6.11.0-1
- rebase to latest upstream version 6.11.0 
- radeon-6.11.0-git.patch: enable R600 acceleration for EXA and Xv.


radeon-6.11.0-git.patch:

--- NEW FILE radeon-6.11.0-git.patch ---
diff --git a/configure.ac b/configure.ac
index 0523cc0..28207d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.11.0,
+        6.11.0.99,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 
@@ -129,7 +129,7 @@ if test "x$EXA" = xyes; then
         AC_MSG_RESULT(yes)
 
         SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3"
         AC_CHECK_HEADER(exa.h,
                        [have_exa_h="yes"], [have_exa_h="no"])
         CPPFLAGS="$SAVE_CPPFLAGS"
@@ -138,7 +138,7 @@ else
 fi 
 
 SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3"
 if test "x$have_exa_h" = xyes; then
         AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
         AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
@@ -153,6 +153,7 @@ if test "x$have_exa_h" = xyes; then
 
         if test "x$USE_EXA" = xyes; then
                 AC_DEFINE(USE_EXA, 1, [Build support for Exa])
+                AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we know how to handle])
         fi
 fi
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c15cc30..7ff7d31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,7 @@ XMODE_SRCS=\
         modes/xf86DiDGA.c
 
 if USE_EXA
-RADEON_EXA_SOURCES = radeon_exa.c
+RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c
 endif
 
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
@@ -128,6 +128,12 @@ EXTRA_DIST = \
 	radeon_render.c \
 	radeon_accelfuncs.c \
 	radeon_textured_videofuncs.c \
+	r600_reg.h \
+	r600_reg_auto_r6xx.h \
+	r600_reg_r6xx.h \
+	r600_reg_r7xx.h \
+	r600_shader.h \
+	r600_state.h \
 	ati.h \
 	ativersion.h \
 	bicubic_table.h \
diff --git a/src/r600_exa.c b/src/r600_exa.c
new file mode 100644
index 0000000..17c5567
--- /dev/null
+++ b/src/r600_exa.c
@@ -0,0 +1,4441 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Alex Deucher <alexander.deucher at amd.com>
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+
+#include "exa.h"
+
+#include "radeon.h"
+#include "radeon_macros.h"
+#include "r600_shader.h"
+#include "r600_reg.h"
+#include "r600_state.h"
+
+extern PixmapPtr
+RADEONGetDrawablePixmap(DrawablePtr pDrawable);
+
+//#define SHOW_VERTEXES
+
+#       define RADEON_ROP3_ZERO             0x00000000
+#       define RADEON_ROP3_DSa              0x00880000
+#       define RADEON_ROP3_SDna             0x00440000
+#       define RADEON_ROP3_S                0x00cc0000
+#       define RADEON_ROP3_DSna             0x00220000
+#       define RADEON_ROP3_D                0x00aa0000
+#       define RADEON_ROP3_DSx              0x00660000
+#       define RADEON_ROP3_DSo              0x00ee0000
+#       define RADEON_ROP3_DSon             0x00110000
+#       define RADEON_ROP3_DSxn             0x00990000
+#       define RADEON_ROP3_Dn               0x00550000
+#       define RADEON_ROP3_SDno             0x00dd0000
+#       define RADEON_ROP3_Sn               0x00330000
+#       define RADEON_ROP3_DSno             0x00bb0000
+#       define RADEON_ROP3_DSan             0x00770000
+#       define RADEON_ROP3_ONE              0x00ff0000
+
+uint32_t RADEON_ROP[16] = {
+    RADEON_ROP3_ZERO, /* GXclear        */
+    RADEON_ROP3_DSa,  /* Gxand          */
+    RADEON_ROP3_SDna, /* GXandReverse   */
+    RADEON_ROP3_S,    /* GXcopy         */
+    RADEON_ROP3_DSna, /* GXandInverted  */
+    RADEON_ROP3_D,    /* GXnoop         */
+    RADEON_ROP3_DSx,  /* GXxor          */
+    RADEON_ROP3_DSo,  /* GXor           */
+    RADEON_ROP3_DSon, /* GXnor          */
+    RADEON_ROP3_DSxn, /* GXequiv        */
+    RADEON_ROP3_Dn,   /* GXinvert       */
+    RADEON_ROP3_SDno, /* GXorReverse    */
+    RADEON_ROP3_Sn,   /* GXcopyInverted */
+    RADEON_ROP3_DSno, /* GXorInverted   */
+    RADEON_ROP3_DSan, /* GXnand         */
+    RADEON_ROP3_ONE,  /* GXset          */
+};
+
+static void
+R600DoneSolid(PixmapPtr pPix);
+
+static void
+R600DoneComposite(PixmapPtr pDst);
+
+
+static Bool
+R600PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+    RADEONInfoPtr info = RADEONPTR(pScrn);
+    struct radeon_accel_state *accel_state = info->accel_state;
+    cb_config_t     cb_conf;
+    shader_config_t vs_conf, ps_conf;
+    int pmask = 0;
+    uint32_t a, r, g, b;
+    float ps_alu_consts[4];
+
+    accel_state->dst_mc_addr = exaGetPixmapOffset(pPix) + info->fbLocation + pScrn->fbOffset;
+    accel_state->dst_size = exaGetPixmapPitch(pPix) * pPix->drawable.height;
+    accel_state->dst_pitch = exaGetPixmapPitch(pPix) / (pPix->drawable.bitsPerPixel / 8);
+
+    // bad pitch
+    if (accel_state->dst_pitch & 7)
+	return FALSE;
+
+    // bad offset
+    if (accel_state->dst_mc_addr & 0xff)
+	return FALSE;
+
+    if (pPix->drawable.bitsPerPixel == 24)
+	return FALSE;
+
+    CLEAR (cb_conf);
+    CLEAR (vs_conf);
+    CLEAR (ps_conf);
+
+    //return FALSE;
+
+#ifdef SHOW_VERTEXES
+    ErrorF("%dx%d @ %dbpp, 0x%08x\n", pPix->drawable.width, pPix->drawable.height,
+	   pPix->drawable.bitsPerPixel, exaGetPixmapPitch(pPix));
+#endif
+
+    accel_state->ib = RADEONCPGetBuffer(pScrn);
+
[...12234 lines suppressed...]
 		       short src_x, short src_y,
@@ -214,7 +277,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
 	break;
     }
 
-   dstPitch = (dstPitch + 63) & ~63;
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	dstPitch = (dstPitch + 255) & ~255;
+    else
+	dstPitch = (dstPitch + 63) & ~63;
 
     if (pPriv->video_memory != NULL && size != pPriv->size) {
 	radeon_legacy_free_memory(pScrn, pPriv->video_memory);
@@ -222,16 +288,21 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     }
 
     if (pPriv->video_memory == NULL) {
-	pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
-						            &pPriv->video_memory,
-						            size * 2, 64);
+	if (info->ChipFamily >= CHIP_FAMILY_R600)
+	    pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
+								&pPriv->video_memory,
+								size * 2, 256);
+	else
+	    pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
+								&pPriv->video_memory,
+								size * 2, 64);
 	if (pPriv->video_offset == 0)
 	    return BadAlloc;
     }
 
     /* Bicubic filter setup */
     pPriv->bicubic_enabled = (pPriv->bicubic_state != BICUBIC_OFF);
-    if (!(IS_R300_3D || IS_R500_3D))
+    if (!(IS_R300_3D || IS_R500_3D || IS_R600_3D))
 	pPriv->bicubic_enabled = FALSE;
     if (pPriv->bicubic_enabled && (pPriv->bicubic_state == BICUBIC_AUTO)) {
 	/*
@@ -280,7 +351,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
 
     pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset;
-    pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
+    else
+	pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
     pPriv->src_pitch = dstPitch;
     pPriv->size = size;
     pPriv->pDraw = pDraw;
@@ -294,29 +368,51 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     switch(id) {
     case FOURCC_YV12:
     case FOURCC_I420:
-	top &= ~1;
-	nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
-	s2offset = srcPitch * height;
-	s3offset = (srcPitch2 * (height >> 1)) + s2offset;
-	top &= ~1;
-	pPriv->src_addr += left << 1;
-	tmp = ((top >> 1) * srcPitch2) + (left >> 1);
-	s2offset += tmp;
-	s3offset += tmp;
-	if (id == FOURCC_I420) {
-	    tmp = s2offset;
-	    s2offset = s3offset;
-	    s3offset = tmp;
+	if (info->ChipFamily >= CHIP_FAMILY_R600) {
+	    s2offset = srcPitch * height;
+	    s3offset = (srcPitch2 * (height >> 1)) + s2offset;
+	    if (id == FOURCC_YV12)
+		R600CopyPlanar(pScrn, buf, buf + s3offset, buf + s2offset,
+			       pPriv->src_offset,
+			       srcPitch, srcPitch2, pPriv->src_pitch,
+			       width, height);
+	    else
+		R600CopyPlanar(pScrn, buf, buf + s2offset, buf + s3offset,
+			       pPriv->src_offset,
+			       srcPitch, srcPitch2, pPriv->src_pitch,
+			       width, height);
+
+	} else {
+	    top &= ~1;
+	    nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
+	    s2offset = srcPitch * height;
+	    s3offset = (srcPitch2 * (height >> 1)) + s2offset;
+	    top &= ~1;
+	    pPriv->src_addr += left << 1;
+	    tmp = ((top >> 1) * srcPitch2) + (left >> 1);
+	    s2offset += tmp;
+	    s3offset += tmp;
+	    if (id == FOURCC_I420) {
+		tmp = s2offset;
+		s2offset = s3offset;
+		s3offset = tmp;
+	    }
+	    RADEONCopyMungedData(pScrn, buf + (top * srcPitch) + left,
+				 buf + s2offset, buf + s3offset, pPriv->src_addr,
+				 srcPitch, srcPitch2, dstPitch, nlines, npixels);
 	}
-	RADEONCopyMungedData(pScrn, buf + (top * srcPitch) + left,
-			     buf + s2offset, buf + s3offset, pPriv->src_addr,
-			     srcPitch, srcPitch2, dstPitch, nlines, npixels);
 	break;
     case FOURCC_UYVY:
     case FOURCC_YUY2:
     default:
-	nlines = ((y2 + 0xffff) >> 16) - top;
-	RADEONCopyData(pScrn, buf, pPriv->src_addr, srcPitch, dstPitch, nlines, npixels, 2);
+	if (info->ChipFamily >= CHIP_FAMILY_R600) {
+	    R600CopyPacked(pScrn, buf, pPriv->src_offset,
+			   2 * width, pPriv->src_pitch,
+			   width, height);
+	} else {
+	    nlines = ((y2 + 0xffff) >> 16) - top;
+	    RADEONCopyData(pScrn, buf, pPriv->src_addr, srcPitch, dstPitch, nlines, npixels, 2);
+	}
 	break;
     }
 
@@ -340,7 +436,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     pPriv->h = height;
 
 #ifdef XF86DRI
-    if (info->directRenderingEnabled)
+    if (IS_R600_3D)
+	R600DisplayTexturedVideo(pScrn, pPriv);
+    else if (info->directRenderingEnabled)
 	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
     else
 #endif
@@ -370,6 +468,16 @@ static XF86VideoEncodingRec DummyEncodingR500[1] =
     }
 };
 
+static XF86VideoEncodingRec DummyEncodingR600[1] =
+{
+    {
+	0,
+	"XV_IMAGE",
+	IMAGE_MAX_WIDTH_R600, IMAGE_MAX_HEIGHT_R600,
+	{1, 1}
+    }
+};
+
 #define NUM_FORMATS 3
 
 static XF86VideoFormatRec Formats[NUM_FORMATS] =
@@ -471,7 +579,9 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
     adapt->flags = 0;
     adapt->name = "Radeon Textured Video";
     adapt->nEncodings = 1;
-    if (IS_R500_3D)
+    if (IS_R600_3D)
+	adapt->pEncodings = DummyEncodingR600;
+    else if (IS_R500_3D)
 	adapt->pEncodings = DummyEncodingR500;
     else
 	adapt->pEncodings = DummyEncoding;
@@ -483,7 +593,7 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
     pPortPriv =
 	(RADEONPortPrivPtr)(&adapt->pPortPrivates[num_texture_ports]);
 
-    if (IS_R300_3D || IS_R500_3D) {
+    if (IS_R300_3D || IS_R500_3D || IS_R600_3D) {
 	adapt->pAttributes = Attributes_r300;
 	adapt->nAttributes = NUM_ATTRIBUTES_R300;
     } else {
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index c6ed472..f55ae12 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1475,16 +1475,16 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 	}
     }
 
-    FUNC_NAME(RADEONWaitForVLine)(pScrn, pPixmap,
-				  radeon_covering_crtc_num(pScrn,
-							   pPriv->drw_x,
-							   pPriv->drw_x + pPriv->dst_w,
-							   pPriv->drw_y,
-							   pPriv->drw_y + pPriv->dst_h,
-							   pPriv->desired_crtc),
-				  pPriv->drw_y,
-				  pPriv->drw_y + pPriv->dst_h,
-				  pPriv->vsync);
+    if (pPriv->vsync)
+	FUNC_NAME(RADEONWaitForVLine)(pScrn, pPixmap,
+				      radeon_covering_crtc_num(pScrn,
+							       pPriv->drw_x,
+							       pPriv->drw_x + pPriv->dst_w,
+							       pPriv->drw_y,
+							       pPriv->drw_y + pPriv->dst_h,
+							       pPriv->desired_crtc),
+				      pPriv->drw_y,
+				      pPriv->drw_y + pPriv->dst_h);
 
     /*
      * Rendering of the actual polygon is done in two different


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	7 Jan 2009 03:18:44 -0000	1.25
+++ .cvsignore	27 Feb 2009 03:57:32 -0000	1.26
@@ -1 +1 @@
-xf86-video-ati-6.10.0.tar.bz2
+xf86-video-ati-6.11.0.tar.bz2

radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.31 -r 1.32 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- radeon-modeset.patch	19 Dec 2008 23:23:19 -0000	1.31
+++ radeon-modeset.patch	27 Feb 2009 03:57:32 -0000	1.32
@@ -1,833 +1,8 @@
-commit 5b9a9a964c92859cce4f31e3121cb26b11b4bc63
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Sat Dec 20 09:14:05 2008 +1000
-
-    radeon: drop old CS2 setup
-
-commit 80a220979642ff99a23cd0af59b0fcafc74da2e2
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Dec 19 12:37:01 2008 +1100
-
-    radeon: only do mappings if direct rendering is enabled
-
-commit 399da3eeea3d273db920e67bffc47c11b688ca7d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 9 13:29:18 2008 +1000
-
-    radeon: upstream fix for Init3D vs switch to/from 2d/3d
-
-commit 6105102abaa70b1e9c1c24a6f48ba9b4f6a63496
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 8 14:19:47 2008 +1000
-
-    radeon: only update dri buffers if DRI enabled
-
-commit aef93b70e7b1d0b1d393582273d549551be198f6
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 1 15:31:08 2008 +1100
-
-    radeon: don't have 2D and 3D in one CS buffer
-
-commit 4fb18164866698d9d42f8cf41fdad3cf10ff34f4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 16:09:29 2008 +1100
-
-    radeon: set touched flag on pinned buffers
-
-commit 26ea3f4afcf90fbb25abbbd4b5ac2433a63425c0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 16:04:35 2008 +1100
-
-    radeon: fix up some of the touched by gpu handling and force gtt handling
-    
-    this fixes DFS on the rs690
-
-commit 86447551a72e216df71fca64f5e16ded22c5a1ad
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 12:52:24 2008 +1100
-
-    radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often
-    
-    this might take more CPU but hopefully leads to stabler GPU
-
-commit 049244cc1a430e46497ad730c54a5e1e66bb7a4c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 25 17:20:44 2008 +1100
-
-    radeon: rs690 stabilisation fixes.
-    
-    Flush the VAP due a IB hang on the VAP setup regs.
-    Flush the TX earlier.
-    Emit a right to SC_CLIP_RULE to flush as per r500 docs.
-
-commit ba06b37bde0ad00f8a6b12003d56aeb603227143
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:56:02 2008 +1000
-
-    radeon: wait for rendering before doing UTS
-
-commit f36db245fac91aad08b4cd2c131e0c47c21bb950
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:54:27 2008 +1000
-
-    radeon: stop this_op_read from going negative
-
-commit b1121141af82075ec16edfdd6095320000f4504b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:52:42 2008 +1000
-
-    radeon: return flush for conflicting domains
-
-commit d7f1cebb0cf2d5a8110606e7ef22284cc256df72
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:50:47 2008 +1000
-
-    radeon: only reset state2d before emitting cache flush
-
-commit 0f58052bcdce741aa0f6bb63566c390d7c246632
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:48:33 2008 +1000
-
-    flush on UTS if any references
-
-commit a29231ab45efc153b6ab1ad19e960d2294aa85ab
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:44:40 2008 +1000
-
-    radeon: add gart vs vram writes
-
-commit 298e92586d11439bc22aab2cb2f7f61f1e80d70f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:37:07 2008 +1000
-
-    radeon: improve DFS performance for non-vram objects
-
-commit 2737e395af3fac9707ea7e05e1dd6aaf2dcc303e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 14:49:44 2008 +1000
-
-    radeon: scrap state on LeaveVT not EnterVT
-
-commit 99e240bbfe3990be735cfa90c7c9e2d560c7ea6e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 11:08:34 2008 +1000
-
-    radeon: even more typos
-
-commit 523e6ae553b4ddffdf82d3759d6b6b63a0230144
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 07:51:03 2008 +1000
-
-    radeon: oops bad typo
-
-commit 05a8c61ef69d4270606129426e45d17bf77d0bbc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 16:09:10 2008 +1000
-
-    radeon: even if kernels fails, struggle onwards
-    
-    try and keep the session going even if visual glitches happen
-
-commit 52459be7e841e38e609dd4abad9a67848399219e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 15:46:46 2008 +1000
-
-    radeon_bufmgr: much more complete size check functionality
-
-commit 9910bcbe2b85e3242e2373111605d117e6f3a29d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 14:33:44 2008 +1000
-
-    radeon: I fail at uint32_t division
-
-commit f3f4b0574cf9eb01b69c8ebe7a7da0e05b32f1e4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 12:06:02 2008 +1000
-
-    radeon: workaround O(wtf) logic in post_submit bufmgr
-
-commit d75dafc38eda798bf4f91b5f8e040d8894631d7c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 19:19:43 2008 +1000
-
-    radeon: set emit limit to 90% VRAM
-
-commit 53eb14298f7b493968462606318301bfa3d62a81
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 16:16:51 2008 +1000
-
-    radeon: use get/set master ioctls
-
-commit 4c154285ebbda9ff5848f02397ff698dc9e57bf3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:56:16 2008 +1000
-
-    radeon: make space accounting a lot smarter
-
-commit 5c7b6f8b8e5a50f49f42658553a66d5fbcd7ae8d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:55:12 2008 +1000
-
-    radeon: retry on CS2 EAGAIN
-
-commit 99e9d3981c323ada2aa0c1bbe976a0e4a9c450e5
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:20:59 2008 +1000
-
-    radeon: add src/mask/dest to fallbacks
-
-commit 455e9f5f6e5a3e648ffd6135570fbc53abd25609
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:20:37 2008 +1000
-
-    radeon_memory: align all allocations
-
-commit 16a417dfeda8d991fb32770280bfe614f5c79f96
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 11:03:34 2008 +1000
-
-    radeon: force gtt for mmap after fallbacks
-
-commit f3f900ff53b8d46614e5757f958cac8b88ef53bb
[...3962 lines suppressed...]
 +    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 +    RADEONInfoPtr info = RADEONPTR(pScrn);
 +
-+
++#if 0
 +    info->mm.gart_texture_buffer =
 +	radeon_allocate_memory(pScrn, RADEON_POOL_GART,
 +			       info->dri->gartTexMapSize,
@@ -8642,7 +7757,7 @@
 +    }
 +
 +    radeon_bind_memory(pScrn, info->mm.gart_texture_buffer);
-+
++#endif
 +    return TRUE;
 +}
 +
@@ -8664,10 +7779,10 @@
 +}
 +
 diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index 5cd610c..907c52b 100644
+index 49044e3..9a01a24 100644
 --- a/src/radeon_probe.h
 +++ b/src/radeon_probe.h
-@@ -183,6 +183,27 @@ typedef struct
+@@ -142,6 +142,27 @@ typedef struct
      Bool hw_capable;
  } RADEONI2CBusRec, *RADEONI2CBusPtr;
  
@@ -8695,20 +7810,20 @@
  typedef struct _RADEONCrtcPrivateRec {
      void *crtc_rotate_mem;
      void *cursor_mem;
-@@ -195,6 +216,8 @@ typedef struct _RADEONCrtcPrivateRec {
-     uint32_t crtc_offset;
+@@ -155,6 +176,8 @@ typedef struct _RADEONCrtcPrivateRec {
      int can_tile;
      Bool enabled;
+     Bool initialized;
 +    struct radeon_memory *cursor;
 +
  } RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr;
  
- typedef struct {
+ typedef struct _radeon_encoder {
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index 7712344..b147495 100644
+index cbedb7e..da60494 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
-@@ -39,6 +39,7 @@
+@@ -40,6 +40,7 @@
  #include "radeon_macros.h"
  #include "radeon_probe.h"
  #include "radeon_video.h"
@@ -8716,7 +7831,7 @@
  
  #include <X11/extensions/Xv.h>
  #include "fourcc.h"
-@@ -111,6 +112,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -124,6 +125,7 @@ static __inline__ uint32_t F_TO_24(float val)
  #define BEGIN_ACCEL(n)		RADEONWaitForFifo(pScrn, (n))
  #define OUT_ACCEL_REG(reg, val)	OUTREG(reg, val)
  #define OUT_ACCEL_REG_F(reg, val) OUTREG(reg, F_TO_DW(val))
@@ -8724,7 +7839,7 @@
  #define FINISH_ACCEL()
  
  #include "radeon_textured_videofuncs.c"
-@@ -120,6 +122,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -133,6 +135,7 @@ static __inline__ uint32_t F_TO_24(float val)
  #undef BEGIN_ACCEL
  #undef OUT_ACCEL_REG
  #undef OUT_ACCEL_REG_F
@@ -8732,7 +7847,7 @@
  #undef FINISH_ACCEL
  
  #ifdef XF86DRI
-@@ -133,6 +136,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -146,6 +149,7 @@ static __inline__ uint32_t F_TO_24(float val)
  #define OUT_ACCEL_REG_F(reg, val)	OUT_ACCEL_REG(reg, F_TO_DW(val))
  #define FINISH_ACCEL()		ADVANCE_RING()
  #define OUT_RING_F(x) OUT_RING(F_TO_DW(x))
@@ -8740,18 +7855,8 @@
  
  #include "radeon_textured_videofuncs.c"
  
-@@ -214,7 +218,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
- 	break;
-     }
- 
--   dstPitch = (dstPitch + 63) & ~63;
-+    /* always align to 64 bytes - fixes issue with non-CP code */
-+    dstPitch = (dstPitch + 63) & ~63;
- 
-     if (pPriv->video_memory != NULL && size != pPriv->size) {
- 	radeon_legacy_free_memory(pScrn, pPriv->video_memory);
-@@ -227,6 +232,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
- 						            size * 2, 64);
+@@ -298,6 +302,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+ 								size * 2, 64);
  	if (pPriv->video_offset == 0)
  	    return BadAlloc;
 +
@@ -8760,7 +7865,7 @@
      }
  
      /* Bicubic filter setup */
-@@ -250,6 +258,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -321,6 +328,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  	pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset;
  	if (pPriv->bicubic_offset == 0)
  		pPriv->bicubic_enabled = FALSE;
@@ -8770,12 +7875,15 @@
      }
  
      if (pDraw->type == DRAWABLE_WINDOW)
-@@ -279,8 +290,19 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -350,11 +360,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
 -    pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset;
--    pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
+-    if (info->ChipFamily >= CHIP_FAMILY_R600)
+-	pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
+-    else
+-	pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
 +    pPriv->src_offset = pPriv->video_offset;
 +    if (info->new_cs) {
 +	int ret;
@@ -8787,12 +7895,15 @@
 +    } else if (info->drm_mm) {
 +        pPriv->src_addr = (uint8_t *)(info->mm.front_buffer->map + pPriv->video_offset + (top * dstPitch));
 +    } else {
-+        pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
++        if (info->ChipFamily >= CHIP_FAMILY_R600)
++            pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
++	else
++            pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
 +    }
      pPriv->src_pitch = dstPitch;
      pPriv->size = size;
      pPriv->pDraw = pDraw;
-@@ -321,8 +343,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -417,8 +438,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      }
  
      /* Upload bicubic filter tex */
@@ -8819,20 +7930,22 @@
  
      /* update cliplist */
      if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
-@@ -339,8 +377,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -435,10 +472,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->w = width;
      pPriv->h = height;
  
 +    if (info->new_cs)
 +	dri_bo_unmap(pPriv->src_bo);
  #ifdef XF86DRI
--    if (info->directRenderingEnabled)
+     if (IS_R600_3D)
+ 	R600DisplayTexturedVideo(pScrn, pPriv);
+-    else if (info->directRenderingEnabled)
 +    if (info->directRenderingEnabled || info->drm_mode_setting)
  	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 410430c..b51637a 100644
+index f55ae12..5d23ad9 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
 @@ -92,6 +92,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
@@ -8908,6 +8021,15 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
+@@ -143,7 +186,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			  RADEON_WAIT_DMA_GUI_IDLE);
+ 	    FINISH_ACCEL();
+ 
+-	    if (!info->accel_state->XInited3D)
++	    if (!info->accel_state->XInited3D && !info->drm_mm)
+ 		RADEONInit3DEngine(pScrn);
+ 	}
+ 
 @@ -213,13 +256,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  
  	txoffset = pPriv->src_offset;
@@ -9006,7 +8128,7 @@
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
 diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 423ea28..ae62549 100644
+index 2fb5fcc..33a4fd6 100644
 --- a/src/radeon_video.c
 +++ b/src/radeon_video.c
 @@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)


Index: radeon.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- radeon.xinf	7 Jan 2009 03:18:45 -0000	1.10
+++ radeon.xinf	27 Feb 2009 03:57:32 -0000	1.11
@@ -263,9 +263,15 @@
 alias pcivideo:v00001002d00009456sv*sd*bc*sc*i* radeon # ATI FirePro V8700 (FireGL)
 alias pcivideo:v00001002d0000945Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4870
 alias pcivideo:v00001002d0000945Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON M98
+alias pcivideo:v00001002d0000946Asv*sd*bc*sc*i* radeon # ATI FirePro M7750
+alias pcivideo:v00001002d0000946Bsv*sd*bc*sc*i* radeon # ATI M98
+alias pcivideo:v00001002d0000947Asv*sd*bc*sc*i* radeon # ATI M98
+alias pcivideo:v00001002d0000947Bsv*sd*bc*sc*i* radeon # ATI M98
 alias pcivideo:v00001002d00009487sv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
+alias pcivideo:v00001002d00009489sv*sd*bc*sc*i* radeon # ATI FirePro M5750
 alias pcivideo:v00001002d0000948Fsv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
 alias pcivideo:v00001002d00009490sv*sd*bc*sc*i* radeon # ATI RV730XT [Radeon HD 4670]
+alias pcivideo:v00001002d00009491sv*sd*bc*sc*i* radeon # ATI RADEON E4600
 alias pcivideo:v00001002d00009498sv*sd*bc*sc*i* radeon # ATI RV730 PRO [Radeon HD 4650]
 alias pcivideo:v00001002d0000949Csv*sd*bc*sc*i* radeon # ATI FirePro V7750 (FireGL)
 alias pcivideo:v00001002d0000949Esv*sd*bc*sc*i* radeon # ATI FirePro V5700 (FireGL)
@@ -281,19 +287,27 @@
 alias pcivideo:v00001002d000094C9sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2400
 alias pcivideo:v00001002d000094CBsv*sd*bc*sc*i* radeon # ATI RADEON E2400
 alias pcivideo:v00001002d000094CCsv*sd*bc*sc*i* radeon # ATI RV610
+alias pcivideo:v00001002d000094CDsv*sd*bc*sc*i* radeon # ATI FireMV 2260
 alias pcivideo:v00001002d00009500sv*sd*bc*sc*i* radeon # ATI RV670
 alias pcivideo:v00001002d00009501sv*sd*bc*sc*i* radeon # ATI Radeon HD3870
+alias pcivideo:v00001002d00009504sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3850
 alias pcivideo:v00001002d00009505sv*sd*bc*sc*i* radeon # ATI Radeon HD3850
+alias pcivideo:v00001002d00009506sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3850 X2
 alias pcivideo:v00001002d00009507sv*sd*bc*sc*i* radeon # ATI RV670
+alias pcivideo:v00001002d00009508sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3870
+alias pcivideo:v00001002d00009509sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3870 X2
 alias pcivideo:v00001002d0000950Fsv*sd*bc*sc*i* radeon # ATI Radeon HD3870 X2
 alias pcivideo:v00001002d00009511sv*sd*bc*sc*i* radeon # ATI FireGL V7700
 alias pcivideo:v00001002d00009515sv*sd*bc*sc*i* radeon # ATI Radeon HD3850
+alias pcivideo:v00001002d00009517sv*sd*bc*sc*i* radeon # ATI Radeon HD3690
+alias pcivideo:v00001002d00009519sv*sd*bc*sc*i* radeon # AMD Firestream 9170
 alias pcivideo:v00001002d00009540sv*sd*bc*sc*i* radeon # ATI Radeon HD 4550
 alias pcivideo:v00001002d00009541sv*sd*bc*sc*i* radeon # ATI Radeon RV710
 alias pcivideo:v00001002d0000954Esv*sd*bc*sc*i* radeon # ATI Radeon RV710
 alias pcivideo:v00001002d0000954Fsv*sd*bc*sc*i* radeon # ATI Radeon HD 4350
 alias pcivideo:v00001002d00009552sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4300 Series
 alias pcivideo:v00001002d00009553sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4500 Series
+alias pcivideo:v00001002d00009555sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4500 Series
 alias pcivideo:v00001002d00009580sv*sd*bc*sc*i* radeon # ATI RV630
 alias pcivideo:v00001002d00009581sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600
 alias pcivideo:v00001002d00009583sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600 XT
@@ -306,12 +320,16 @@
 alias pcivideo:v00001002d0000958Csv*sd*bc*sc*i* radeon # ATI FireGL V5600
 alias pcivideo:v00001002d0000958Dsv*sd*bc*sc*i* radeon # ATI FireGL V3600
 alias pcivideo:v00001002d0000958Esv*sd*bc*sc*i* radeon # ATI Radeon HD 2600 LE
-alias pcivideo:v00001002d00009592sv*sd*bc*sc*i* radeon # ATI Radeon RV710
+alias pcivideo:v00001002d0000958Fsv*sd*bc*sc*i* radeon # ATI Mobility FireGL Graphics Processor
+alias pcivideo:v00001002d00009542sv*sd*bc*sc*i* radeon # ATI Radeon RV710
 alias pcivideo:v00001002d000095C0sv*sd*bc*sc*i* radeon # ATI Radeon HD 3470
 alias pcivideo:v00001002d000095C2sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3430
 alias pcivideo:v00001002d000095C4sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3400 Series
 alias pcivideo:v00001002d000095C5sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
+alias pcivideo:v00001002d000095C6sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
 alias pcivideo:v00001002d000095C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 3430
+alias pcivideo:v00001002d000095C9sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
+alias pcivideo:v00001002d000095CCsv*sd*bc*sc*i* radeon # ATI FirePro V3700
 alias pcivideo:v00001002d000095CDsv*sd*bc*sc*i* radeon # ATI FireMV 2450
 alias pcivideo:v00001002d000095CEsv*sd*bc*sc*i* radeon # ATI FireMV 2260
 alias pcivideo:v00001002d000095CFsv*sd*bc*sc*i* radeon # ATI FireMV 2260
@@ -322,6 +340,8 @@
 alias pcivideo:v00001002d00009599sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 PRO
 alias pcivideo:v00001002d00009591sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3650
 alias pcivideo:v00001002d00009593sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3670
+alias pcivideo:v00001002d00009595sv*sd*bc*sc*i* radeon # ATI Mobility FireGL V5700
+alias pcivideo:v00001002d0000959Bsv*sd*bc*sc*i* radeon # ATI Mobility FireGL V5725
 alias pcivideo:v00001002d00009610sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics
 alias pcivideo:v00001002d00009611sv*sd*bc*sc*i* radeon # ATI Radeon 3100 Graphics
 alias pcivideo:v00001002d00009612sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	7 Jan 2009 03:18:45 -0000	1.25
+++ sources	27 Feb 2009 03:57:32 -0000	1.26
@@ -1 +1 @@
-6445815b12ffa4ccd1aafd43640f466d  xf86-video-ati-6.10.0.tar.bz2
+b4120aa6a3bb22a7a3bc83cba060675a  xf86-video-ati-6.11.0.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- xorg-x11-drv-ati.spec	26 Feb 2009 10:40:46 -0000	1.149
+++ xorg-x11-drv-ati.spec	27 Feb 2009 03:57:32 -0000	1.150
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.10.0
-Release:   4%{?dist}
+Version:   6.11.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,13 +14,11 @@
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   radeon.xinf
 
+Patch0:     radeon-6.11.0-git.patch
 Patch1:     radeon-modeset.patch
-Patch2:     radeon-modeset-fix-legacy-vt.patch
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
-Patch7:     radeon-mode-fix-rotate.patch
-Patch8:	    radeon-fix-rs780-mm.patch
 
 ExcludeArch: s390 s390x
 
@@ -42,13 +40,11 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-fix-vt
 #patch4 -p1 -b .remove-limit-heuristics
-%patch5 -p1 -b .panel-size
+#%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
-%patch7 -p1 -b .fix-rotate
-%patch8 -p1 -b .rs780-fix
 
 %build
 autoreconf -iv
@@ -80,6 +76,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com> 6.11.0-1
+- rebase to latest upstream
+- enable R600 acceleration for EXA and Xv.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- radeon-fix-rs780-mm.patch DELETED ---


--- radeon-mode-fix-rotate.patch DELETED ---


--- radeon-modeset-fix-legacy-vt.patch DELETED ---




More information about the fedora-extras-commits mailing list