summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-07-16 16:21:21 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-07-16 16:37:38 +0000
commit39766010cd35b1c58ce8f03b3679b20398eacb1b (patch)
tree33fc2c51279273314c6bd3ec9a6c56b692f7ab64
parentcc85860ccb44ac0a5a08217b9c9ba3fcef3b3a52 (diff)
Revert "r300: Gracefully exit after GART memory is exhausted."
This reverts commit 9457bf62bbba3b9226ebbbea5dc7798ca22485f6. Causes the X server to die with Compiz and Beryl.
-rw-r--r--src/mesa/drivers/dri/r300/r300_mem.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_mem.c b/src/mesa/drivers/dri/r300/r300_mem.c
index a66508bdcd..f8f9d4fcdf 100644
--- 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;