Mesa (master): r300g: do not print a rejected CS if RADEON_DUMP_CS is not set
Marek Olšák
mareko at kemper.freedesktop.org
Sat Jul 10 18:46:38 UTC 2010
Module: Mesa
Branch: master
Commit: d63cb78dddb2fc185b6031c06bcab6c1f0315fd9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d63cb78dddb2fc185b6031c06bcab6c1f0315fd9
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Jul 10 20:34:29 2010 +0200
r300g: do not print a rejected CS if RADEON_DUMP_CS is not set
Also print relocation failures on non-debug builds too.
---
src/gallium/winsys/radeon/drm/radeon_drm_buffer.c | 4 ++--
src/gallium/winsys/radeon/drm/radeon_r300.c | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
index cb4ec32..c5f133e 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
@@ -361,8 +361,8 @@ void radeon_drm_bufmgr_write_reloc(struct pb_buffer *_buf,
retval = radeon_cs_write_reloc(buf->mgr->rws->cs,
buf->bo, gem_rd, gem_wd, flags);
if (retval) {
- debug_printf("radeon: Relocation of %p (%d, %d, %d) failed!\n",
- buf, gem_rd, gem_wd, flags);
+ fprintf(stderr, "radeon: Relocation of %p (%d, %d, %d) failed!\n",
+ buf, gem_rd, gem_wd, flags);
}
}
diff --git a/src/gallium/winsys/radeon/drm/radeon_r300.c b/src/gallium/winsys/radeon/drm/radeon_r300.c
index 51cfc0f..af35497 100644
--- a/src/gallium/winsys/radeon/drm/radeon_r300.c
+++ b/src/gallium/winsys/radeon/drm/radeon_r300.c
@@ -252,8 +252,13 @@ static void radeon_flush_cs(struct r300_winsys_screen *rws)
/* Emit the CS. */
retval = radeon_cs_emit(ws->cs);
if (retval) {
- debug_printf("radeon: Bad CS, dumping...\n");
- radeon_cs_print(ws->cs, stderr);
+ if (debug_get_bool_option("RADEON_DUMP_CS", FALSE)) {
+ fprintf(stderr, "radeon: The kernel rejected CS, dumping...\n");
+ radeon_cs_print(ws->cs, stderr);
+ } else {
+ fprintf(stderr, "radeon: The kernel rejected CS, "
+ "see dmesg for more information.\n");
+ }
}
/* Reset CS.
More information about the mesa-commit
mailing list