From abc7b110b6f6dbd00db3633a68cc836170465d91 Mon Sep 17 00:00:00 2001 From: Constantine Charlamov Date: Sat, 24 Jun 2017 15:52:05 +0300 Subject: [PATCH] r600g: fix crash when file in R600_TRACE doesn't exist MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit …and print error in such case. Which probably is not a rare event btw because fopen doesn't expand ~ to $HOME. Also get rid of unused "bool ret" variable. Signed-off-by: Constantine Kharlamov Signed-off-by: Dave Airlie --- src/gallium/drivers/r600/r600_hw_context.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 9b01e8e..ca7f41d 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -295,15 +295,16 @@ void r600_context_gfx_flush(void *context, unsigned flags, ctx->b.num_gfx_cs_flushes++; if (ctx->is_debug) { - bool ret = ws->fence_wait(ws, ctx->b.last_gfx_fence, 10000000); - if (ret == false) { + if (!ws->fence_wait(ws, ctx->b.last_gfx_fence, 10000000)) { const char *fname = getenv("R600_TRACE"); if (!fname) exit(-1); FILE *fl = fopen(fname, "w+"); - if (fl) + if (fl) { eg_dump_debug_state(&ctx->b.b, fl, 0); - fclose(fl); + fclose(fl); + } else + perror(fname); exit(-1); } } -- 2.7.4