From dad2ee26f0fd73dde65697da7422b2d5d8016487 Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Sun, 3 May 2026 19:42:33 -0400 Subject: [PATCH] nvk: Disable compression on Turing We've had multiple reports that this is broken on Turing right now. Disable it until someone figures out what's wrong. See also: https://gitlab.freedesktop.org/mesa/mesa/-/work_items/15358 Fixes: b524bf368e8 ("nvk: Reenable compression support with nouveau 1.4.2") Reviewed-by: Karol Herbst Reviewed-by: Mary Guillemard (cherry picked from commit e81a292165add2997276dd30cd65381aa49ca72d) Part-of: --- .pick_status.json | 2 +- src/nouveau/vulkan/nvkmd/nouveau/nvkmd_nouveau_pdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 613f0d0e811..2e6c0ea36f0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -264,7 +264,7 @@ "description": "nvk: Disable compression on Turing", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b524bf368e8efa7cd024bc8497c3a09dcab71f85", "notes": null diff --git a/src/nouveau/vulkan/nvkmd/nouveau/nvkmd_nouveau_pdev.c b/src/nouveau/vulkan/nvkmd/nouveau/nvkmd_nouveau_pdev.c index 809b635661e..93a74adb802 100644 --- a/src/nouveau/vulkan/nvkmd/nouveau/nvkmd_nouveau_pdev.c +++ b/src/nouveau/vulkan/nvkmd/nouveau/nvkmd_nouveau_pdev.c @@ -16,7 +16,7 @@ #include #include -#include "clc597.h" +#include "clc697.h" static bool drm_device_is_nouveau(const char *path) @@ -102,7 +102,7 @@ nvkmd_nouveau_try_create_pdev(struct _drmDevice *drm_device, .has_map_fixed = true, .has_overmap = true, .has_compression = ws_dev->nouveau_version >= 0x01000402 && - ws_dev->info.cls_eng3d >= TURING_A, + ws_dev->info.cls_eng3d >= AMPERE_A, }; /* We get this ourselves */