From a067399e375023cfbc3e8c130cc8a30c3115a672 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 19 Apr 2021 09:30:49 +1000 Subject: [PATCH] iris: move get_time into a static in bufmgr code. This ends up polluting the namespace if you build iris/crocus at once, just move it to where it's used for now. Reviewed-by: Kenneth Graunke Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 13 +++++++++++++ src/gallium/drivers/iris/iris_context.c | 13 ------------- src/gallium/drivers/iris/iris_context.h | 2 -- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index be50e5b5488..24fcb22cb36 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -101,6 +101,19 @@ #define FILE_DEBUG_FLAG DEBUG_BUFMGR +/** + * For debugging purposes, this returns a time in seconds. + */ +static double +get_time(void) +{ + struct timespec tp; + + clock_gettime(CLOCK_MONOTONIC, &tp); + + return tp.tv_sec + tp.tv_nsec / 1000000000.0; +} + static inline int atomic_add_unless(int *v, int add, int unless) { diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c index 493632893ce..607711ede82 100644 --- a/src/gallium/drivers/iris/iris_context.c +++ b/src/gallium/drivers/iris/iris_context.c @@ -36,19 +36,6 @@ #include "common/intel_defines.h" #include "common/intel_sample_positions.h" -/** - * For debugging purposes, this returns a time in seconds. - */ -double -get_time(void) -{ - struct timespec tp; - - clock_gettime(CLOCK_MONOTONIC, &tp); - - return tp.tv_sec + tp.tv_nsec / 1000000000.0; -} - /** * The pipe->set_debug_callback() driver hook. */ diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 6403ef4948c..f5bf715531c 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -814,8 +814,6 @@ struct iris_context { pipe_debug_message(dbg, PERF_INFO, __VA_ARGS__); \ } while(0) -double get_time(void); - struct pipe_context * iris_create_context(struct pipe_screen *screen, void *priv, unsigned flags);