fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-15 19:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk/jm: Use the new pan_fb code for emitting fragment jobs

Browse source 
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Acked-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39759>
This commit is contained in:
Faith Ekstrand 2026-01-26 15:34:04 -05:00 • committed by Marge Bot
parent 071838e634
commit 3fe56db780
2 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/panfrost/vulkan/jm/panvk_vX_cmd_buffer.c
View file

@ -37,7 +37,7 @@
static VkResult
panvk_cmd_prepare_fragment_job(struct panvk_cmd_buffer *cmdbuf, uint64_t fbd)
{
const struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.render.fb.info;
const struct pan_fb_layout *fb = &cmdbuf->state.gfx.render.fb.layout;
struct panvk_batch *batch = cmdbuf->cur_batch;
struct pan_ptr job_ptr = panvk_cmd_alloc_desc(cmdbuf, FRAGMENT_JOB);
@ -45,10 +45,12 @@ panvk_cmd_prepare_fragment_job(struct panvk_cmd_buffer *cmdbuf, uint64_t fbd)
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
pan_section_pack(job_ptr.cpu, FRAGMENT_JOB, PAYLOAD, payload) {
payload.bound_min_x = fbinfo->draw_extent.minx >> MALI_TILE_SHIFT;
payload.bound_min_y = fbinfo->draw_extent.miny >> MALI_TILE_SHIFT;
payload.bound_max_x = fbinfo->draw_extent.maxx >> MALI_TILE_SHIFT;
payload.bound_max_y = fbinfo->draw_extent.maxy >> MALI_TILE_SHIFT;
assert(pan_fb_bbox_is_valid(fb->tiling_area_px));
payload.bound_min_x = fb->tiling_area_px.min_x >> MALI_TILE_SHIFT;
payload.bound_min_y = fb->tiling_area_px.min_y >> MALI_TILE_SHIFT;
payload.bound_max_x = fb->tiling_area_px.max_x >> MALI_TILE_SHIFT;
payload.bound_max_y = fb->tiling_area_px.max_y >> MALI_TILE_SHIFT;
payload.framebuffer = fbd;
}
@ -71,9 +73,6 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
if (!batch)
return;
struct panvk_rendering_state *render = &cmdbuf->state.gfx.render;
struct pan_fb_info *fbinfo = &render->fb.info;
assert(batch);
if (!batch->fb.desc.gpu && !batch->vtc_jc.first_job) {
@ -130,15 +129,13 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
if (batch->fb.desc.cpu) {
panvk_per_arch(cmd_select_tile_size)(cmdbuf);
/* At this point, we should know sample count and the tile size should have
* been calculated */
assert(fbinfo->nr_samples > 0 && fbinfo->tile_size > 0);
fbinfo->sample_positions =
dev->sample_positions->addr.dev +
pan_sample_positions_offset(pan_sample_pattern(fbinfo->nr_samples));
fbinfo->first_provoking_vertex =
cmdbuf->state.gfx.render.first_provoking_vertex != U_TRISTATE_NO;
/* At this point, we should know sample count and the tile size should
* have been calculated
*/
const struct panvk_rendering_state *render = &cmdbuf->state.gfx.render;
const struct pan_fb_info *fbinfo = &render->fb.info;
assert(render->fb.layout.sample_count > 0);
assert(render->fb.layout.tile_size_px > 0);
struct pan_fb_frame_shaders fs;
VkResult result = panvk_per_arch(cmd_fb_preload_fbinfo)(cmdbuf,
@ -146,6 +143,19 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
if (result != VK_SUCCESS)
return;
const uint8_t sample_count = render->fb.layout.sample_count;
struct pan_fb_desc_info fbd_info = {
.fb = &render->fb.layout,
.load = &render->fb.load,
.store = &render->fb.store,
.sample_pos_array_pointer = dev->sample_positions->addr.dev +
pan_sample_positions_offset(pan_sample_pattern(sample_count)),
.provoking_vertex_first =
cmdbuf->state.gfx.render.first_provoking_vertex != U_TRISTATE_NO,
.tls = &batch->tlsinfo,
.tiler_ctx = &batch->tiler.ctx,
};
uint32_t view_mask = cmdbuf->state.gfx.render.view_mask;
assert(view_mask == 0 || util_bitcount(view_mask) <= batch->fb.layer_count);
uint32_t enabled_layer_count = view_mask ?
@ -164,11 +174,10 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
pan_ptr_offset(batch->fb.desc, batch->fb.desc_stride * layer_id);
uint64_t tagged_fbd_ptr = fbd.gpu;
fbinfo->bifrost = pan_fb_to_fbinfo_frame_shaders(fs, layer_id);
tagged_fbd_ptr |= GENX(pan_emit_fbd)(
&cmdbuf->state.gfx.render.fb.info, layer_id, &batch->tlsinfo,
&batch->tiler.ctx, fbd.cpu);
fbd_info.layer = layer_id;
fbd_info.frame_shaders = fs;
fbd_info.frame_shaders.dcd_pointer += layer_id * 3 * pan_size(DRAW);
tagged_fbd_ptr |= GENX(pan_emit_fb_desc)(&fbd_info, fbd.cpu);
result = panvk_cmd_prepare_fragment_job(cmdbuf, tagged_fbd_ptr);
if (result != VK_SUCCESS)
@ -188,8 +197,8 @@ panvk_per_arch(cmd_alloc_fb_desc)(struct panvk_cmd_buffer *cmdbuf)
return VK_SUCCESS;
struct panvk_rendering_state *render = &cmdbuf->state.gfx.render;
const struct pan_fb_info *fbinfo = &render->fb.info;
bool has_zs_ext = fbinfo->zs.view.zs || fbinfo->zs.view.s;
const struct pan_fb_layout *fb = &render->fb.layout;
bool has_zs_ext = pan_fb_has_zs(fb);
batch->fb.layer_count = render->layer_count;
unsigned fbd_size = pan_size(FRAMEBUFFER);
@ -198,7 +207,7 @@ panvk_per_arch(cmd_alloc_fb_desc)(struct panvk_cmd_buffer *cmdbuf)
pan_size(ZS_CRC_EXTENSION);
fbd_size = ALIGN_POT(fbd_size, pan_alignment(RENDER_TARGET)) +
(MAX2(fbinfo->rt_count, 1) * pan_size(RENDER_TARGET));
(MAX2(fb->rt_count, 1) * pan_size(RENDER_TARGET));
batch->fb.bo_count = cmdbuf->state.gfx.render.fb.bo_count;
memcpy(batch->fb.bos, cmdbuf->state.gfx.render.fb.bos,
@ -243,7 +252,7 @@ panvk_per_arch(cmd_prepare_tiler_context)(struct panvk_cmd_buffer *cmdbuf,
goto out_set_layer_ctx;
}
const struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.render.fb.info;
const struct pan_fb_layout *fb = &cmdbuf->state.gfx.render.fb.layout;
uint32_t layer_count = cmdbuf->state.gfx.render.layer_count;
batch->tiler.heap_desc = panvk_cmd_alloc_desc(cmdbuf, TILER_HEAP);
batch->tiler.ctx_descs =
@ -264,10 +273,10 @@ panvk_per_arch(cmd_prepare_tiler_context)(struct panvk_cmd_buffer *cmdbuf,
pan_pack(&batch->tiler.ctx_templ, TILER_CONTEXT, cfg) {
cfg.hierarchy_mask = panvk_select_tiler_hierarchy_mask(
phys_dev, &cmdbuf->state.gfx, pan_kmod_bo_size(dev->tiler_heap->bo));
cfg.fb_width = fbinfo->width;
cfg.fb_height = fbinfo->height;
cfg.fb_width = fb->width_px;
cfg.fb_height = fb->height_px;
cfg.heap = batch->tiler.heap_desc.gpu;
cfg.sample_pattern = pan_sample_pattern(fbinfo->nr_samples);
cfg.sample_pattern = pan_sample_pattern(fb->sample_count);
}
memcpy(batch->tiler.heap_desc.cpu, &batch->tiler.heap_templ,

12
src/panfrost/vulkan/panvk_cmd_fb_preload.h
View file

@ -20,16 +20,4 @@ VkResult panvk_per_arch(cmd_fb_preload)(struct panvk_cmd_buffer *cmdbuf,
const struct pan_fb_load *load,
struct pan_fb_frame_shaders *fs_out);
static inline struct pan_fb_bifrost_info
pan_fb_to_fbinfo_frame_shaders(struct pan_fb_frame_shaders fs,
uint32_t idx)
{
return (struct pan_fb_bifrost_info) {
.pre_post = {
.dcds.gpu = fs.dcd_pointer + idx * 3 * pan_size(DRAW),
.modes = { fs.modes[0], fs.modes[1], fs.modes[2] },
}
};
}
#endif