Revert "r300: Gracefully exit after GART memory is exhausted."

This reverts commit 9457bf62bb.

Causes the X server to die with Compiz and Beryl.
This commit is contained in:
Oliver McFadden
2007-07-16 16:21:21 +00:00
parent cc85860ccb
commit 39766010cd
+14 -1
View File
@@ -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;