diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 17:58:56 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 18:29:12 -0700 |
| commit | a79aa0d7b27b0b9b032472776d7dda410fd66a98 (patch) | |
| tree | b75521103e34499e72771cd1219ccdc24fca38b2 /src/common.h | |
| parent | 760021e3983f7783900075b8c9603bd4fbe7e0a2 (diff) | |
| parent | f9e94c17c55e4c75802d8574c908744e286e7843 (diff) | |
Merge branch 'broadwater-video-rehash' into broadwater
Conflicts:
src/Makefile.am
src/common.h
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_accel.c
src/i830_cursor.c
src/i830_dri.c
src/i830_dri.h
src/i830_driver.c
src/i830_memory.c
src/i830_rotate.c
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 1e3327c6..ad5ee1de 100644 --- a/src/common.h +++ b/src/common.h @@ -130,13 +130,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) |