rpms/mesa/devel mesa.spec,1.202,1.203 r300-bufmgr.patch,1.4,1.5
Dave Airlie
airlied at fedoraproject.org
Sun Oct 19 09:16:41 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21611
Modified Files:
mesa.spec r300-bufmgr.patch
Log Message:
* Sun Oct 19 2008 Dave Airlie <airlied at redhat.com> 7.2-0.9
- r300: re-enable zerocopy TFP for non-kms system
- r300: fix sw fallbacks on !kms + fix debug
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- mesa.spec 19 Oct 2008 08:40:44 -0000 1.202
+++ mesa.spec 19 Oct 2008 09:16:11 -0000 1.203
@@ -423,7 +423,8 @@
%changelog
* Sun Oct 19 2008 Dave Airlie <airlied at redhat.com> 7.2-0.9
-- r300: re-enable zerocopy TFP for non-kms systems
+- r300: re-enable zerocopy TFP for non-kms system
+- r300: fix sw fallbacks on !kms + fix debug
* 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- r300-bufmgr.patch 19 Oct 2008 08:40:45 -0000 1.4
+++ r300-bufmgr.patch 19 Oct 2008 09:16:11 -0000 1.5
@@ -1,3 +1,15 @@
+commit e768e7df0f6b7f61f82d70a55c7419c359b17cb2
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Oct 19 18:56:56 2008 +1000
+
+ r300: fixup no kms case for map/unmap
+
+commit 6b6995112d3223496c04e7afc338ffc9bcc5093e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Oct 19 18:42:24 2008 +1000
+
+ radeon: disable leak detection for now
+
commit 445d367fed8b55a1351788dbf3e2e303e56095b5
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Oct 19 18:28:45 2008 +1000
@@ -3148,10 +3160,10 @@
extern void r300InitIoctlFuncs(struct dd_function_table *functions);
diff --git a/src/mesa/drivers/dri/r300/r300_mem.c b/src/mesa/drivers/dri/r300/r300_mem.c
-index f8f9d4f..948a62e 100644
+index f8f9d4f..5b90e42 100644
--- a/src/mesa/drivers/dri/r300/r300_mem.c
+++ b/src/mesa/drivers/dri/r300/r300_mem.c
-@@ -27,359 +27,879 @@
+@@ -27,359 +27,882 @@
/**
* \file
@@ -3860,9 +3872,10 @@
+{
+ radeon_bufmgr_classic *bufmgr = get_bufmgr_classic(bo_base->base.bufmgr);
+
-+ /* don't map static here - we have hardcoded maps */
-+// bo_base->base.virtual = bufmgr->screen->driScreen->pFB +
-+// (bo_base->base.offset - bufmgr->screen->fbLocation);
++ /* don't map static for kernel mm - we have hardcoded maps */
++ if (!bufmgr->screen->kernel_mm)
++ bo_base->base.virtual = bufmgr->screen->driScreen->pFB +
++ (bo_base->base.offset - bufmgr->screen->fbLocation);
+
+ /* Read the first pixel in the frame buffer. This should
+ * be a noop, right? In fact without this conform fails as reading
@@ -3890,8 +3903,10 @@
+static void static_unmap(radeon_bo_classic *bo_base)
{
- unsigned long offset;
-+ /* don't unmap we have hardcoded maps */
-+// bo_base->base.virtual = 0;
++ radeon_bufmgr_classic *bufmgr = get_bufmgr_classic(bo_base->base.bufmgr);
++ /* don't unmap for kernel mm we have hardcoded maps */
++ if (!bufmgr->screen->kernel_mm)
++ bo_base->base.virtual = 0;
+}
- assert(id <= rmesa->rmm->u_last);
@@ -4222,9 +4237,9 @@
+ track_pending_buffers(bufmgr);
+
+ if (bufmgr->buffers) {
-+ fprintf(stderr, "Warning: Buffer objects have leaked\n");
++ //fprintf(stderr, "Warning: Buffer objects have leaked\n");
+ while(bufmgr->buffers) {
-+ fprintf(stderr, " Leak of size %ld\n", bufmgr->buffers->base.size);
++ // fprintf(stderr, " Leak of size %ld\n", bufmgr->buffers->base.size);
+ bufmgr->buffers->refcount = 0;
+ bufmgr->buffers->mapcount = 0;
+ bufmgr->buffers->pending = 0;
More information about the scm-commits
mailing list