From 09c4ed4f2c9358fe490dc72d2b8a46ec0a06809b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Mon, 24 Oct 2022 13:53:34 -0700 Subject: [PATCH] iris: Do not export iris_bo_wait() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It has a single user, so no need to export it. Signed-off-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 22 +++++++++++----------- src/gallium/drivers/iris/iris_bufmgr.h | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index d73010e..2198a17 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -1690,16 +1690,6 @@ iris_bo_map(struct util_debug_callback *dbg, return map; } -/** Waits for all GPU rendering with the object to have completed. */ -void -iris_bo_wait_rendering(struct iris_bo *bo) -{ - /* We require a kernel recent enough for WAIT_IOCTL support. - * See intel_init_bufmgr() - */ - iris_bo_wait(bo, -1); -} - static int iris_bo_wait_gem(struct iris_bo *bo, int64_t timeout_ns) { @@ -1745,7 +1735,7 @@ iris_bo_wait_gem(struct iris_bo *bo, int64_t timeout_ns) * Note that some kernels have broken the infinite wait for negative values * promise, upgrade to latest stable kernels if this is the case. */ -int +static inline int iris_bo_wait(struct iris_bo *bo, int64_t timeout_ns) { int ret; @@ -1760,6 +1750,16 @@ iris_bo_wait(struct iris_bo *bo, int64_t timeout_ns) return ret; } +/** Waits for all GPU rendering with the object to have completed. */ +void +iris_bo_wait_rendering(struct iris_bo *bo) +{ + /* We require a kernel recent enough for WAIT_IOCTL support. + * See intel_init_bufmgr() + */ + iris_bo_wait(bo, -1); +} + static void iris_bufmgr_destroy(struct iris_bufmgr *bufmgr) { diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h index 8e7fd15..01cf854 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.h +++ b/src/gallium/drivers/iris/iris_bufmgr.h @@ -495,8 +495,6 @@ struct iris_bo *iris_bo_gem_create_from_name(struct iris_bufmgr *bufmgr, void* iris_bufmgr_get_aux_map_context(struct iris_bufmgr *bufmgr); -int iris_bo_wait(struct iris_bo *bo, int64_t timeout_ns); - uint32_t iris_create_hw_context(struct iris_bufmgr *bufmgr, bool protected); uint32_t iris_clone_hw_context(struct iris_bufmgr *bufmgr, uint32_t ctx_id); int iris_kernel_context_get_priority(struct iris_bufmgr *bufmgr, uint32_t ctx_id); -- 2.7.4