From da61149b2a6e04acf7c8046a5e128b5b33d4ee09 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 Jul 2025 16:43:58 -0400
Subject: [PATCH] nak: disable imma 8x8x16 on Blackwell+

It's not supported anymore

Fixes: 669c8a51452e ("nvk: Advertise VK_KHR_cooperative_matrix")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36163>
---
 src/nouveau/vulkan/nvk_physical_device.c | 30 +++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index baae2676192..73b2a22a488 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -56,7 +56,7 @@
 #include "clc797.h"
 #include "clc6c0.h"
 #include "clc997.h"
-
+#include "clcdc0.h"
 static uint32_t
 nvk_get_vk_version(const struct nv_device_info *info)
 {
@@ -1796,20 +1796,22 @@ nvk_GetPhysicalDeviceCooperativeMatrixPropertiesKHR(VkPhysicalDevice physicalDev
             if (result_type == VK_COMPONENT_TYPE_UINT32_KHR && sat)
                continue;
 
-            vk_outarray_append_typed(VkCooperativeMatrixPropertiesKHR, &out, p)
-            {
-               *p = (struct VkCooperativeMatrixPropertiesKHR){
-                  .sType = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
-                  .MSize = 8,
-                  .NSize = 8,
-                  .KSize = 16,
-                  .AType = input_type_ab,
-                  .BType = input_type_ab,
-                  .CType = result_type,
-                  .ResultType = result_type,
-                  .saturatingAccumulation = sat,
+            if (pdev->info.cls_compute < BLACKWELL_COMPUTE_A) {
+               vk_outarray_append_typed(VkCooperativeMatrixPropertiesKHR, &out, p)
+               {
+                  *p = (struct VkCooperativeMatrixPropertiesKHR){
+                     .sType = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
+                     .MSize = 8,
+                     .NSize = 8,
+                     .KSize = 16,
+                     .AType = input_type_ab,
+                     .BType = input_type_ab,
+                     .CType = result_type,
+                     .ResultType = result_type,
+                     .saturatingAccumulation = sat,
                   .scope = VK_SCOPE_SUBGROUP_KHR
-               };
+                  };
+               }
             }
 
             if (pdev->info.cls_compute >= AMPERE_COMPUTE_A) {