diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2018-05-08 17:25:55 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-05-10 08:31:54 -0700 |
| commit | 7da026cb98204f9a74a3f2521cd620c6e056921f (patch) | |
| tree | ba457175c7246801d9f27c00c317624e90156b7f | |
| parent | 2c140183d411b17951a2a570674b9adab222d10a (diff) | |
anv: emit pixel scoreboard stall before ISP disable
We want to make sure that all indirect state data has been loaded into
the EUs before disable the pointers.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Fixes: 78c125af3904c ("anv/gen10: Ignore push constant packets during context restore.")
(cherry picked from commit 766d801ca32118a722fb2e58a48ee9a96897d3b7)
| -rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 2882cf36506..526e18af108 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -1420,14 +1420,21 @@ genX(BeginCommandBuffer)( * context restore, so the mentioned hang doesn't happen. However, * software must program push constant commands for all stages prior to * rendering anything. So we flag them dirty in BeginCommandBuffer. + * + * Finally, we also make sure to stall at pixel scoreboard to make sure the + * constants have been loaded into the EUs prior to disable the push constants + * so that it doesn't hang a previous 3DPRIMITIVE. */ static void emit_isp_disable(struct anv_cmd_buffer *cmd_buffer) { anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) { - pc.IndirectStatePointersDisable = true; + pc.StallAtPixelScoreboard = true; pc.CommandStreamerStallEnable = true; } + anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) { + pc.IndirectStatePointersDisable = true; + } } VkResult |