From fa4a0b7f634077363d704a90d535194f93040d42 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Fri, 1 Apr 2022 14:47:04 +0200 Subject: [PATCH] anv: Ensure we clear ANV_PIPE_PSS_STALL_SYNC_BIT on flush Add the PSS stall bit to ANV_PIPE_STALL_BITS so that it get's cleared on flush. Fixes: f3c62973 ("anv,iris: PSS Stall Sync around color fast clears") Signed-off-by: Rohan Garg Reviewed-by: Nanley Chery Reviewed-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit ad9c0e8cd9a95862b555615159b8a261036a7324) --- .pick_status.json | 2 +- src/intel/vulkan/anv_private.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 51f99a3..0573a0c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -949,7 +949,7 @@ "description": "anv: Ensure we clear ANV_PIPE_PSS_STALL_SYNC_BIT on flush", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f3c629733fd0e6cf4d5d9bf0f0dad2df7a199b04" }, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 205a917..ed1b789 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -2117,7 +2117,8 @@ enum anv_pipe_bits { #define ANV_PIPE_STALL_BITS ( \ ANV_PIPE_STALL_AT_SCOREBOARD_BIT | \ ANV_PIPE_DEPTH_STALL_BIT | \ - ANV_PIPE_CS_STALL_BIT) + ANV_PIPE_CS_STALL_BIT | \ + ANV_PIPE_PSS_STALL_SYNC_BIT) #define ANV_PIPE_INVALIDATE_BITS ( \ ANV_PIPE_STATE_CACHE_INVALIDATE_BIT | \ -- 2.7.4