projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc85860
)
Revert "r300: Gracefully exit after GART memory is exhausted."
author
Oliver McFadden
<z3ro.geek@gmail.com>
Mon, 16 Jul 2007 16:21:21 +0000
(16:21 +0000)
committer
Oliver McFadden
<z3ro.geek@gmail.com>
Mon, 16 Jul 2007 16:37:38 +0000
(16:37 +0000)
This reverts commit
9457bf62bbba3b9226ebbbea5dc7798ca22485f6
.
Causes the X server to die with Compiz and Beryl.
src/mesa/drivers/dri/r300/r300_mem.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r300/r300_mem.c
b/src/mesa/drivers/dri/r300/r300_mem.c
index
a66508b
..
f8f9d4f
100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_mem.c
+++ b/
src/mesa/drivers/dri/r300/r300_mem.c
@@
-208,10
+208,23
@@
int r300_mem_alloc(r300ContextPtr rmesa, int alignment, int size)
drmCommandWriteRead(rmesa->radeon.dri.fd, DRM_RADEON_ALLOC, &alloc,
sizeof(alloc));
if (ret) {
+#if 0
+ WARN_ONCE("Ran out of mem!\n");
+ r300FlushCmdBuf(rmesa, __FUNCTION__);
+ //usleep(100);
+ tries2++;
+ tries = 0;
+ if (tries2 > 100) {
+ WARN_ONCE("Ran out of GART memory!\n");
+ exit(1);
+ }
+ goto again;
+#else
WARN_ONCE
("Ran out of GART memory (for %d)!\nPlease consider adjusting GARTSize option.\n",
size);
- exit(1);
+ return 0;
+#endif
}
i = free;