From 02a638cc51491a827d852313e780ca0c35f699c9 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 23 Mar 2020 19:10:06 -0400 Subject: [PATCH] panfrost: Isolate panfrost_bo_access_for_stage to pan_cmdstream.c We don't use it outside this file (and really shouldn't) and it has a strict Gallium dependency in pan_bo.h. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_bo.h | 17 ----------------- src/gallium/drivers/panfrost/pan_cmdstream.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_bo.h b/src/gallium/drivers/panfrost/pan_bo.h index ba7bc23341d..ef9e7033a1c 100644 --- a/src/gallium/drivers/panfrost/pan_bo.h +++ b/src/gallium/drivers/panfrost/pan_bo.h @@ -115,23 +115,6 @@ struct panfrost_bo { uint32_t gpu_access; }; -/* If a BO is accessed for a particular shader stage, will it be in the primary - * batch (vertex/tiler) or the secondary batch (fragment)? Anything but - * fragment will be primary, e.g. compute jobs will be considered - * "vertex/tiler" by analogy */ - -static inline uint32_t -panfrost_bo_access_for_stage(enum pipe_shader_type stage) -{ - assert(stage == PIPE_SHADER_FRAGMENT || - stage == PIPE_SHADER_VERTEX || - stage == PIPE_SHADER_COMPUTE); - - return stage == PIPE_SHADER_FRAGMENT ? - PAN_BO_ACCESS_FRAGMENT : - PAN_BO_ACCESS_VERTEX_TILER; -} - bool panfrost_bo_wait(struct panfrost_bo *bo, int64_t timeout_ns, uint32_t access_type); diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 8c2bcd25e2b..b84b4e2a5a3 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -34,6 +34,23 @@ #include "pan_context.h" #include "pan_job.h" +/* If a BO is accessed for a particular shader stage, will it be in the primary + * batch (vertex/tiler) or the secondary batch (fragment)? Anything but + * fragment will be primary, e.g. compute jobs will be considered + * "vertex/tiler" by analogy */ + +static inline uint32_t +panfrost_bo_access_for_stage(enum pipe_shader_type stage) +{ + assert(stage == PIPE_SHADER_FRAGMENT || + stage == PIPE_SHADER_VERTEX || + stage == PIPE_SHADER_COMPUTE); + + return stage == PIPE_SHADER_FRAGMENT ? + PAN_BO_ACCESS_FRAGMENT : + PAN_BO_ACCESS_VERTEX_TILER; +} + /* TODO: Bifrost requires just a mali_shared_memory, without the rest of the * framebuffer */ -- 2.30.2