summaryrefslogtreecommitdiffstats
path: root/src/amd/vulkan
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2017-03-28 20:09:36 +0100
committerDave Airlie <[email protected]>2017-03-28 20:12:10 +0100
commit93d61e494518a5dd170c2b098b2ed7a26465d049 (patch)
tree9764d5f8011d30c57fd3ad91e702457c8173c2f1 /src/amd/vulkan
parentf208bdc0d27cf7836420272738b707f2bad9c92a (diff)
radv: only emit ps_input_cntl is we have any to output
Otherwise we get GPU hangs. Reported-by: Alex Smith <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
-rw-r--r--src/amd/vulkan/radv_cmd_buffer.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index e994df65fd2..e6f098c208d 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -697,9 +697,12 @@ radv_emit_fragment_shader(struct radv_cmd_buffer *cmd_buffer,
radeon_set_context_reg(cmd_buffer->cs, R_028238_CB_TARGET_MASK, blend->cb_target_mask);
radeon_set_context_reg(cmd_buffer->cs, R_02823C_CB_SHADER_MASK, blend->cb_shader_mask);
- radeon_set_context_reg_seq(cmd_buffer->cs, R_028644_SPI_PS_INPUT_CNTL_0, pipeline->graphics.ps_input_cntl_num);
- for (unsigned i = 0; i < pipeline->graphics.ps_input_cntl_num; i++)
- radeon_emit(cmd_buffer->cs, pipeline->graphics.ps_input_cntl[i]);
+ if (pipeline->graphics.ps_input_cntl_num) {
+ radeon_set_context_reg_seq(cmd_buffer->cs, R_028644_SPI_PS_INPUT_CNTL_0, pipeline->graphics.ps_input_cntl_num);
+ for (unsigned i = 0; i < pipeline->graphics.ps_input_cntl_num; i++) {
+ radeon_emit(cmd_buffer->cs, pipeline->graphics.ps_input_cntl[i]);
+ }
+ }
}
static void