OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
393558a
)
r300: Gracefully exit after GART memory is exhausted.
author
Oliver McFadden
<z3ro.geek@gmail.com>
Sun, 15 Jul 2007 01:17:54 +0000
(
01:17
+0000)
committer
Oliver McFadden
<z3ro.geek@gmail.com>
Sun, 15 Jul 2007 01:17:54 +0000
(
01:17
+0000)
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
f8f9d4f
..
a66508b
100644
(file)
--- 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;