diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-05-16 15:21:17 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-05-16 15:21:17 -0700 |
| commit | b0ac5303f33f75dc607cf0c705c23db1da836983 (patch) | |
| tree | 16af9140d0c18dde7b829d7fc63fe727c15c946b /src/common.h | |
| parent | 4c727254da354cfd6f35148a334d046d67a50e99 (diff) | |
| parent | c2cd10e1fba0e75c0ed3db5d17211bddf7ab1e33 (diff) | |
Merge branch 'textured-video' into broadwater-video
Conflicts:
src/i830_video.c
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common.h b/src/common.h index 70f58a94..c8e4fb6b 100644 --- a/src/common.h +++ b/src/common.h @@ -125,13 +125,17 @@ extern void I830DPRINTF_stub(const char *filename, int line, #define ADVANCE_LP_RING() do { \ if (ringused > needed) \ - ErrorF("%s: ADVANCE_LP_RING: exceeded allocation %d/%d\n ", \ - __FUNCTION__, ringused, needed); \ + FatalError("%s: ADVANCE_LP_RING: exceeded allocation %d/%d\n ", \ + __FUNCTION__, ringused, needed); \ + else if (ringused < needed) \ + FatalError("%s: ADVANCE_LP_RING: under-used allocation %d/%d\n ", \ + __FUNCTION__, ringused, needed); \ RecPtr->LpRing->tail = outring; \ RecPtr->LpRing->space -= ringused; \ if (outring & 0x07) \ - ErrorF("ADVANCE_LP_RING: " \ - "outring (0x%x) isn't on a QWord boundary\n", outring); \ + FatalError("%s: ADVANCE_LP_RING: " \ + "outring (0x%x) isn't on a QWord boundary\n", \ + __FUNCTION__, outring); \ OUTREG(LP_RING + RING_TAIL, outring); \ } while (0) |