AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tu: Fix fault with variable-count inline uniform blocks

Browse Source 
This seems to have been triggered by some recent CTS changes which
changed the random number generation. I'm seeing context faults in
dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimitlow.sampledimghigh.lowimgnotex.iublimitlow.nouab.comp.noia.0
that are fixed by this.

Fixes: 37cde2c634 ("tu: Rewrite inline uniform implementation")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20039>
This commit is contained in:
Connor Abbott
2022-11-28 15:15:09 +01:00
committed by Marge Bot
parent 6080dce4d8
commit 5e5c42ebb5
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/vulkan/tu_cmd_buffer.c
+19 -7
View File
@@ -4493,13 +4493,25 @@ tu6_emit_user_consts(struct tu_cs *cs,
*/
for (unsigned i = 0; i < link->tu_const_state.num_inline_ubos; i++) {
const struct tu_inline_ubo *ubo = &link->tu_const_state.ubos[i];
tu_cs_emit_pkt7(cs, tu6_stage2opcode(type), 3);
tu_cs_emit(cs, CP_LOAD_STATE6_0_DST_OFF(ubo->const_offset_vec4) |
CP_LOAD_STATE6_0_STATE_TYPE(ST6_CONSTANTS) |
CP_LOAD_STATE6_0_STATE_SRC(SS6_INDIRECT) |
CP_LOAD_STATE6_0_STATE_BLOCK(tu6_stage2shadersb(type)) |
CP_LOAD_STATE6_0_NUM_UNIT(ubo->size_vec4));
tu_cs_emit_qw(cs, descriptors->sets[ubo->base]->va + ubo->offset);
/* With variable-count inline uniform blocks, we allocate constant space
* based on the maximum size specified in the descriptor set layout, but
* the actual size may be smaller. In that case we have to avoid
* fetching out-of-bounds of the buffer that contains the descriptor
* set to avoid faults.
*/
unsigned num_units = MIN2(ubo->size_vec4,
(descriptors->sets[ubo->base]->size - ubo->offset) / 16);
if (num_units > 0) {
tu_cs_emit_pkt7(cs, tu6_stage2opcode(type), 3);
tu_cs_emit(cs, CP_LOAD_STATE6_0_DST_OFF(ubo->const_offset_vec4) |
CP_LOAD_STATE6_0_STATE_TYPE(ST6_CONSTANTS) |
CP_LOAD_STATE6_0_STATE_SRC(SS6_INDIRECT) |
CP_LOAD_STATE6_0_STATE_BLOCK(tu6_stage2shadersb(type)) |
CP_LOAD_STATE6_0_NUM_UNIT(num_units));
tu_cs_emit_qw(cs, descriptors->sets[ubo->base]->va + ubo->offset);
}
}
}