fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

broadcom/vc5: Fix GPU hang with no vertex elements used by the VS.

Browse source 
Like VC4, we need to at least have one element set up, but unlike VC4 it
seems we don't need to read it to keep the HW happy.  Fixes GPU hangs with
glsl-no-vertex-attribs.shader_test.
This commit is contained in:
Eric Anholt 2017-10-23 10:30:37 -07:00
parent 2117d03310
commit 77c7b98ba5
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/drivers/vc5/vc5_draw.c
View file

@ -147,10 +147,12 @@ vc5_emit_gl_shader_state(struct vc5_context *vc5,
&vc5->constbuf[PIPE_SHADER_VERTEX],
&vc5->verttex);
/* See GFXH-930 workaround below */
uint32_t num_elements_to_emit = MAX2(vtx->num_elements, 1);
uint32_t shader_rec_offset =
vc5_cl_ensure_space(&job->indirect,
cl_packet_length(GL_SHADER_STATE_RECORD) +
vtx->num_elements *
num_elements_to_emit *
cl_packet_length(GL_SHADER_STATE_ATTRIBUTE_RECORD),
32);
@ -187,9 +189,9 @@ vc5_emit_gl_shader_state(struct vc5_context *vc5,
shader.coordinate_shader_has_separate_input_and_output_vpm_blocks = true;
shader.vertex_shader_has_separate_input_and_output_vpm_blocks = true;
shader.coordinate_shader_input_vpm_segment_size =
vc5->prog.cs->prog_data.vs->vpm_input_size;
MAX2(vc5->prog.cs->prog_data.vs->vpm_input_size, 1);
shader.vertex_shader_input_vpm_segment_size =
vc5->prog.vs->prog_data.vs->vpm_input_size;
MAX2(vc5->prog.vs->prog_data.vs->vpm_input_size, 1);
shader.coordinate_shader_output_vpm_segment_size =
vc5->prog.cs->prog_data.vs->vpm_output_size;
@ -240,9 +242,27 @@ vc5_emit_gl_shader_state(struct vc5_context *vc5,
cl_emit_prepacked(&job->indirect, &attr_packed);
}
if (vtx->num_elements == 0) {
/* GFXH-930: At least one attribute must be enabled and read
* by CS and VS. If we have no attributes being consumed by
* the shader, set up a dummy to be loaded into the VPM.
*/
cl_emit(&job->indirect, GL_SHADER_STATE_ATTRIBUTE_RECORD, attr) {
/* Valid address of data whose value will be unused. */
attr.address = cl_address(job->indirect.bo, 0);
attr.type = ATTRIBUTE_FLOAT;
attr.stride = 0;
attr.vec_size = 1;
attr.number_of_values_read_by_coordinate_shader = 1;
attr.number_of_values_read_by_vertex_shader = 1;
}
}
cl_emit(&job->bcl, GL_SHADER_STATE, state) {
state.address = cl_address(job->indirect.bo, shader_rec_offset);
state.number_of_attribute_arrays = vtx->num_elements;
state.number_of_attribute_arrays = num_elements_to_emit;
}
vc5_bo_unreference(&cs_uniforms.bo);