Mesa (staging/21.0): radv: flush L2 metadata as part of CB/DB flush instead of CS_DONE on GFX9

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 3994f5db4834b8241140e93723ad2fe2f1343e1a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3994f5db4834b8241140e93723ad2fe2f1343e1a

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Jan 18 19:21:27 2021 +0100

radv: flush L2 metadata as part of CB/DB flush instead of CS_DONE on GFX9

This restores the previous logic because L2 coherency was fully
implemented. It appears that flushing L2 metadata with a CS_DONE
event hangs.

This fixes GPU hangs with Monster Hunter World.

Fixes: 4a783a3c ("radv: Use L2 coherency on GFX9+.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8566>
(cherry picked from commit c3ac6f7cd77e37c083fe35da9a921a55076190bd)

---

 .pick_status.json              |  2 +-
 src/amd/vulkan/si_cmd_buffer.c | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 186a935f687..6f29e35b3a5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "radv: flush L2 metadata as part of CB/DB flush instead of CS_DONE on GFX9",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "4a783a3c7846857671a9f2e91b62850e24e01029"
     },
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 153acac1c84..9be773468d5 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -1353,18 +1353,11 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs,
 		*sqtt_flush_bits |= RGP_FLUSH_CS_PARTIAL_FLUSH;
 	}
 
-	if (chip_class == GFX9 &&
-	    (flush_cb_db || (flush_bits & RADV_CMD_FLAG_INV_L2_METADATA))) {
+	if (chip_class == GFX9 && flush_cb_db) {
 		unsigned cb_db_event, tc_flags;
 
 		/* Set the CB/DB flush event. */
-		if (flush_cb_db) {
-			cb_db_event = V_028A90_CACHE_FLUSH_AND_INV_TS_EVENT;
-		} else {
-			/* Besides the CB the only other thing writing HTILE
-			 * or DCC metadata are our meta compute shaders. */
-			cb_db_event = V_028A90_CS_DONE;
-		}
+		cb_db_event = V_028A90_CACHE_FLUSH_AND_INV_TS_EVENT;
 
 		/* These are the only allowed combinations. If you need to
 		 * do multiple operations at once, do them separately.
@@ -1378,12 +1371,11 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs,
 		 * TC    | TC_MD         = writeback & invalidate L2 metadata (DCC, etc.)
 		 * TCL1                  = invalidate L1
 		 */
-		tc_flags = 0;
+		tc_flags = EVENT_TC_ACTION_ENA |
+			   EVENT_TC_MD_ACTION_ENA;
 
-		if (flush_cb_db) {
-			*sqtt_flush_bits |= RGP_FLUSH_FLUSH_CB | RGP_FLUSH_INVAL_CB |
-			                    RGP_FLUSH_FLUSH_DB | RGP_FLUSH_INVAL_DB;
-		}
+		*sqtt_flush_bits |= RGP_FLUSH_FLUSH_CB | RGP_FLUSH_INVAL_CB |
+			            RGP_FLUSH_FLUSH_DB | RGP_FLUSH_INVAL_DB;
 
 		/* Ideally flush TC together with CB/DB. */
 		if (flush_bits & RADV_CMD_FLAG_INV_L2) {
@@ -1398,9 +1390,6 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs,
 					 RADV_CMD_FLAG_INV_VCACHE);
 
 			*sqtt_flush_bits |= RGP_FLUSH_INVAL_L2;
-		} else if (flush_bits & RADV_CMD_FLAG_INV_L2_METADATA) {
-			tc_flags = EVENT_TC_ACTION_ENA |
-			           EVENT_TC_MD_ACTION_ENA;
 		}
 
 		assert(flush_cnt);