From 4aad059de8a16ab1715b221179fc85138a43f16d Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 26 Mar 2025 17:33:24 -0500 Subject: [PATCH] nak: Fix a SM check for OpPCnt This doens't really fix anything as we don't have any nir_loops on Volta+ but the code was wrong so we should fix it. Fixes: 9bbc6920640b ("nak/nir: Rework CRS handling") Part-of: (cherry picked from commit af9d65e8b8a6522702770b380e3e3b333587f170) --- .pick_status.json | 2 +- src/nouveau/compiler/nak/from_nir.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index addd744a500..1720a9db570 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2394,7 +2394,7 @@ "description": "nak: Fix a SM check for OpPCnt", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9bbc6920640b71503519e513ccb9ce528a16fb8f", "notes": null diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs index 68da90676fc..7a34422508c 100644 --- a/src/nouveau/compiler/nak/from_nir.rs +++ b/src/nouveau/compiler/nak/from_nir.rs @@ -3388,7 +3388,7 @@ impl<'a> ShaderFromNir<'a> { b.push_op(phi); } - if self.sm.sm() < 75 && nb.cf_node.prev().is_none() { + if self.sm.sm() < 70 && nb.cf_node.prev().is_none() { if let Some(_) = nb.parent().as_loop() { b.push_op(OpPCnt { target: self.get_block_label(nb),