fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pvr: Use the SPM EOT on barrier stores

Browse source 
Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24138>
This commit is contained in:
Karmjit Mahil 2023-06-26 13:09:53 +01:00 • committed by Marge Bot
parent ad0ca7a879
commit f1e45f4bbd
2 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/imagination/vulkan/pvr_cmd_buffer.c
View file

@ -1387,30 +1387,50 @@ static VkResult pvr_sub_cmd_gfx_job_init(const struct pvr_device_info *dev_info,
struct pvr_framebuffer *framebuffer = render_pass_info->framebuffer;
struct pvr_spm_bgobj_state *spm_bgobj_state =
&framebuffer->spm_bgobj_state_per_render[sub_cmd->hw_render_idx];
struct pvr_emit_state emit_state = { 0 };
struct pvr_render_target *render_target;
VkResult result;
pvr_setup_emit_state(dev_info, hw_render, render_pass_info, &emit_state);
if (sub_cmd->barrier_store) {
/* There can only ever be one frag job running on the hardware at any one
* time, and a context switch is not allowed mid-tile, so instead of
* allocating a new scratch buffer we can reuse the SPM scratch buffer to
* perform the store.
* So use the SPM EOT program with the SPM PBE reg words in order to store
* the render to the SPM scratch buffer.
*/
memcpy(job->pbe_reg_words,
emit_state.pbe_reg_words,
sizeof(emit_state.pbe_reg_words));
memcpy(job->pbe_reg_words,
&framebuffer->spm_eot_state_per_render[0].pbe_reg_words,
sizeof(job->pbe_reg_words));
job->pds_pixel_event_data_offset =
framebuffer->spm_eot_state_per_render[0]
.pixel_event_program_data_offset;
} else {
struct pvr_emit_state emit_state = { 0 };
result = pvr_sub_cmd_gfx_per_job_fragment_programs_create_and_upload(
cmd_buffer,
emit_state.emit_count,
emit_state.pbe_cs_words[0],
&pds_pixel_event_program);
if (result != VK_SUCCESS)
return result;
pvr_setup_emit_state(dev_info, hw_render, render_pass_info, &emit_state);
job->pds_pixel_event_data_offset = pds_pixel_event_program.data_offset;
memcpy(job->pbe_reg_words,
emit_state.pbe_reg_words,
sizeof(job->pbe_reg_words));
result = pvr_sub_cmd_gfx_per_job_fragment_programs_create_and_upload(
cmd_buffer,
emit_state.emit_count,
emit_state.pbe_cs_words[0],
&pds_pixel_event_program);
if (result != VK_SUCCESS)
return result;
job->pds_pixel_event_data_offset = pds_pixel_event_program.data_offset;
}
if (sub_cmd->barrier_load) {
job->enable_bg_tag = true;
job->process_empty_tiles = true;
/* Load the previously stored render from the SPM scratch buffer. */
STATIC_ASSERT(ARRAY_SIZE(job->pds_bgnd_reg_values) ==
ARRAY_SIZE(spm_bgobj_state->pds_reg_values));
typed_memcpy(job->pds_bgnd_reg_values,
@ -1683,10 +1703,6 @@ static VkResult pvr_sub_cmd_gfx_job_init(const struct pvr_device_info *dev_info,
* case SPM is hit so set the flag unconditionally.
*/
job->requires_spm_scratch_buffer = true;
/* FIXME: We should be using the SPM PBE reg words and the SPM EOT PDS data
* section instead of the regular, but for now we don't have an actual
* SPM EOT USC shader so that would cause problems.
*/
return VK_SUCCESS;
}

4
src/imagination/vulkan/pvr_private.h
View file

@ -459,7 +459,11 @@ struct pvr_sub_cmd_gfx {
bool modifies_depth;
bool modifies_stencil;
/* Store the render to a scratch buffer. */
bool barrier_store;
/* Load the render (stored with a `barrier_store`) as a background to the
* current render.
*/
bool barrier_load;
const struct pvr_query_pool *query_pool;