From 30f3df4e538a668f53a31f0b376e06116b722a10 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 15 Aug 2014 23:07:01 +0100 Subject: [PATCH] winsys/radeon: move radeon_cs_dump.h to drm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ... to ease packaging (make dist). Update it to fetch libdrm's include/libs via pkg-config. Cc: Marek Olšák Cc: Michel Dänzer Signed-off-by: Emil Velikov Reviewed-by: Marek Olšák --- src/gallium/winsys/radeon/{tools => drm}/radeon_ctx.h | 0 src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/gallium/winsys/radeon/{tools => drm}/radeon_ctx.h (100%) diff --git a/src/gallium/winsys/radeon/tools/radeon_ctx.h b/src/gallium/winsys/radeon/drm/radeon_ctx.h similarity index 100% rename from src/gallium/winsys/radeon/tools/radeon_ctx.h rename to src/gallium/winsys/radeon/drm/radeon_ctx.h diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c index 8d67918ce72..09665df3048 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c @@ -81,9 +81,9 @@ void radeon_dump_cs_on_lockup(struct radeon_drm_cs *cs, struct radeon_cs_context } fprintf(dump, "/* To build this file you will need to copy radeon_ctx.h\n"); fprintf(dump, " * in same directory. You can find radeon_ctx.h in mesa tree :\n"); - fprintf(dump, " * mesa/src/gallium/winsys/radeon/tools/radeon_ctx.h\n"); + fprintf(dump, " * mesa/src/gallium/winsys/radeon/drm/radeon_ctx.h\n"); fprintf(dump, " * Build with :\n"); - fprintf(dump, " * gcc -O0 -g %s -ldrm -o rlockup_0x%08x -I/usr/include/libdrm\n", fname, csc->cs_trace_id); + fprintf(dump, " * gcc -O0 -g `pkg-config --cflags --libs libdrm` %s -o rlockup_0x%08x \n", fname, csc->cs_trace_id); fprintf(dump, " */\n"); fprintf(dump, " /* timeout on cs lockup likely happen at cs 0x%08x dw 0x%08x*/\n", ptr[1], ptr[0]); fprintf(dump, "#include \n"); -- 2.30.2