rpms/mesa/devel mesa.spec,1.201,1.202 r300-bufmgr.patch,1.3,1.4
Dave Airlie
airlied at fedoraproject.org
Sun Oct 19 08:41:15 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13471
Modified Files:
mesa.spec r300-bufmgr.patch
Log Message:
- r300: re-enable zerocopy TFP for non-kms systems
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- mesa.spec 14 Oct 2008 13:31:18 -0000 1.201
+++ mesa.spec 19 Oct 2008 08:40:44 -0000 1.202
@@ -18,7 +18,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.2
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -422,6 +422,9 @@
%{_libdir}/mesa-demos-data
%changelog
+* Sun Oct 19 2008 Dave Airlie <airlied at redhat.com> 7.2-0.9
+- r300: re-enable zerocopy TFP for non-kms systems
+
* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com>
- spec-only fix: exit builtin needs a numeric arg, not string.
r300-bufmgr.patch:
Index: r300-bufmgr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/r300-bufmgr.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- r300-bufmgr.patch 13 Oct 2008 05:51:24 -0000 1.3
+++ r300-bufmgr.patch 19 Oct 2008 08:40:45 -0000 1.4
@@ -1,3 +1,9 @@
+commit 445d367fed8b55a1351788dbf3e2e303e56095b5
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Oct 19 18:28:45 2008 +1000
+
+ r300: only enable set tex offset for non-kernel mm systems
+
commit 737b174d7e82cc277d877ff810ffe058e1aa4522
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 13 15:40:58 2008 +1000
@@ -8712,7 +8718,7 @@
+
+#endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index 05107dd..b51ff9f 100644
+index 05107dd..1810ded 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -45,6 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -8733,18 +8739,10 @@
/* Radeon configuration
*/
#include "xmlpool.h"
-@@ -342,17 +346,123 @@ static const __DRItexOffsetExtension r200texOffsetExtension = {
- #endif
-
- #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
-+#if 0
- static const __DRItexOffsetExtension r300texOffsetExtension = {
- { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
- r300SetTexOffset,
+@@ -348,11 +352,115 @@ static const __DRItexOffsetExtension r300texOffsetExtension = {
};
#endif
-+#endif
-+
+
+
+static int
+radeon_gem_update_handle(radeonScreenPtr screen, __DRIscreenPrivate *sPriv,
@@ -8849,7 +8847,7 @@
+ screen->gart_texture_offset = screen->gart_texture.offset + screen->gart_base;
+ return 0;
+}
-
++
/* Create the device specific screen private data struct.
*/
static radeonScreenPtr
@@ -8859,7 +8857,7 @@
radeonScreenPtr screen;
RADEONDRIPtr dri_priv = (RADEONDRIPtr)sPriv->pDevPriv;
unsigned char *RADEONMMIO;
-@@ -387,6 +497,21 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -387,6 +495,21 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
screen->card_type = (dri_priv->IsPCI ? RADEON_CARD_PCI : RADEON_CARD_AGP);
{
int ret;
@@ -8881,7 +8879,7 @@
ret = radeonGetParam( sPriv->fd, RADEON_PARAM_GART_BUFFER_OFFSET,
&screen->gart_buffer_offset);
-@@ -420,32 +545,34 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -420,32 +543,34 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
screen->drmSupportsVertexProgram = (sPriv->drm_version.minor >= 25);
}
@@ -8939,7 +8937,7 @@
screen->buffers = drmMapBufs( sPriv->fd );
if ( !screen->buffers ) {
-@@ -456,22 +583,24 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -456,22 +581,24 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
return NULL;
}
@@ -8979,7 +8977,7 @@
}
screen->chip_flags = 0;
-@@ -838,7 +967,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -838,7 +965,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
ret = radeonGetParam( sPriv->fd, RADEON_PARAM_FB_LOCATION,
&temp);
if (ret) {
@@ -8988,7 +8986,7 @@
screen->fbLocation = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
else {
FREE( screen );
-@@ -879,55 +1008,65 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -879,55 +1006,65 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
}
}
@@ -9097,16 +9095,17 @@
}
i = 0;
-@@ -952,7 +1091,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -952,7 +1089,8 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
#endif
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
- screen->extensions[i++] = &r300texOffsetExtension.base;
-+ //screen->extensions[i++] = &r300texOffsetExtension.base;
++ if (!screen->kernel_mm)
++ screen->extensions[i++] = &r300texOffsetExtension.base;
#endif
screen->extensions[i++] = NULL;
-@@ -973,12 +1112,14 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
+@@ -973,12 +1111,14 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
if (!screen)
return;
@@ -9126,7 +9125,7 @@
/* free all option information */
driDestroyOptionInfo (&screen->optionCache);
-@@ -1002,6 +1143,160 @@ radeonInitDriver( __DRIscreenPrivate *sPriv )
+@@ -1002,6 +1142,160 @@ radeonInitDriver( __DRIscreenPrivate *sPriv )
return GL_TRUE;
}
@@ -9287,7 +9286,7 @@
/**
* Create the Mesa framebuffer and renderbuffers for a given window/drawable.
-@@ -1101,7 +1396,7 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
+@@ -1101,7 +1395,7 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
return (driDrawPriv->driverPrivate != NULL);
}
}
@@ -9296,7 +9295,7 @@
static void
radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
-@@ -1197,11 +1492,11 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1197,11 +1491,11 @@ radeonInitScreen(__DRIscreenPrivate *psp)
if (!radeonInitDriver(psp))
return NULL;
More information about the scm-commits
mailing list