summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-07-15 01:17:54 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-07-15 01:17:54 +0000
commit9457bf62bbba3b9226ebbbea5dc7798ca22485f6 (patch)
tree4eab8d562ca769c57d642d524a471b8f4cc11761 /src
parent393558a933670705f9d3482fd976393a2baca957 (diff)
r300: Gracefully exit after GART memory is exhausted.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r300/r300_mem.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_mem.c b/src/mesa/drivers/dri/r300/r300_mem.c
index f8f9d4fcdf..a66508bdcd 100644
--- a/src/mesa/drivers/dri/r300/r300_mem.c
+++ b/src/mesa/drivers/dri/r300/r300_mem.c
@@ -208,23 +208,10 @@ 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);
- return 0;
-#endif
+ exit(1);
}
i = free;