Module: Mesa Branch: staging/20.0 Commit: 5d2f7e96adce0b19957df7ad99af14195ce822b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d2f7e96adce0b19957df7ad99af14195ce822b2
Author: Jason Ekstrand <[email protected]> Date: Fri Feb 16 11:56:31 2018 -0800 anv: Use the PIPE_CONTROL instead of bits for the CS stall W/A Reviewed-by: Rafael Antognolli <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4005> (cherry picked from commit ac8d412ba39bf5634a218fff23e55c07d7ac81d6) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 272cd3882a2..de167cf31ef 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6160,7 +6160,7 @@ "description": "anv: Use the PIPE_CONTROL instead of bits for the CS stall W/A", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index ded826a2b84..4baa69623cb 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -2103,9 +2103,13 @@ genX(cmd_buffer_apply_pipe_flushes)(struct anv_cmd_buffer *cmd_buffer) * I chose "Stall at Pixel Scoreboard" since that's what we use in * mesa and it seems to work fine. The choice is fairly arbitrary. */ - if ((bits & ANV_PIPE_CS_STALL_BIT) && - !(bits & (ANV_PIPE_FLUSH_BITS | ANV_PIPE_DEPTH_STALL_BIT | - ANV_PIPE_STALL_AT_SCOREBOARD_BIT))) + if (pipe.CommandStreamerStallEnable && + !pipe.RenderTargetCacheFlushEnable && + !pipe.DepthCacheFlushEnable && + !pipe.StallAtPixelScoreboard && + !pipe.PostSyncOperation && + !pipe.DepthStallEnable && + !pipe.DCFlushEnable) pipe.StallAtPixelScoreboard = true; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
