From 47a1daa6da714e1ff29700e4cb97fc45814cceae Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 29 Apr 2024 09:09:09 +0200 Subject: [PATCH] panvk: Kill cmd_get_tiler_context() cmd_prepare_tiler_context() is just a wrapper around cmd_get_tiler_context(), and cmd_get_tiler_context() is only called from cmd_prepare_tiler_context(). Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_cmd_buffer.h | 3 --- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 15 +++------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.h b/src/panfrost/vulkan/panvk_cmd_buffer.h index 5a8a471aa74..a462b6c5f3d 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.h +++ b/src/panfrost/vulkan/panvk_cmd_buffer.h @@ -214,9 +214,6 @@ panvk_per_arch(cmd_open_batch)(struct panvk_cmd_buffer *cmdbuf); void panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf); -void panvk_per_arch(cmd_get_tiler_context)(struct panvk_cmd_buffer *cmdbuf, - unsigned width, unsigned height); - void panvk_per_arch(cmd_alloc_fb_desc)(struct panvk_cmd_buffer *cmdbuf); void panvk_per_arch(cmd_alloc_tls_desc)(struct panvk_cmd_buffer *cmdbuf, diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index 36d566e00a0..b8fed3275a0 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -819,8 +819,7 @@ panvk_draw_prepare_fs_rsd(struct panvk_cmd_buffer *cmdbuf, } void -panvk_per_arch(cmd_get_tiler_context)(struct panvk_cmd_buffer *cmdbuf, - unsigned width, unsigned height) +panvk_per_arch(cmd_prepare_tiler_context)(struct panvk_cmd_buffer *cmdbuf) { struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device); struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.fb.info; @@ -843,8 +842,8 @@ panvk_per_arch(cmd_get_tiler_context)(struct panvk_cmd_buffer *cmdbuf, pan_pack(&batch->tiler.ctx_templ, TILER_CONTEXT, cfg) { cfg.hierarchy_mask = 0x28; - cfg.fb_width = width; - cfg.fb_height = height; + cfg.fb_width = fbinfo->width; + cfg.fb_height = fbinfo->height; cfg.heap = batch->tiler.heap_desc.gpu; cfg.sample_pattern = pan_sample_pattern(fbinfo->nr_samples); } @@ -856,14 +855,6 @@ panvk_per_arch(cmd_get_tiler_context)(struct panvk_cmd_buffer *cmdbuf, batch->tiler.ctx.bifrost = batch->tiler.ctx_desc.gpu; } -void -panvk_per_arch(cmd_prepare_tiler_context)(struct panvk_cmd_buffer *cmdbuf) -{ - const struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.fb.info; - - panvk_per_arch(cmd_get_tiler_context)(cmdbuf, fbinfo->width, fbinfo->height); -} - static void panvk_draw_prepare_tiler_context(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw)