From cd253df92a73d89cd183fee188efa8e36eb9ccb1 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 22 Oct 2025 17:25:58 -0400 Subject: [PATCH] nvk: Include the chipset in the pipeline/binary cache UUID Cc: mesa-stable (cherry picked from commit d1793c7a594f49f8870beeef99bd3edcdb1ddb9f) Part-of: --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 515f4b2d451..38a2107fddd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -964,7 +964,7 @@ "description": "nvk: Include the chipset in the pipeline/binary cache UUID", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 2ce531ca001..e1ded347316 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -1267,6 +1267,9 @@ nvk_physical_device_init_pipeline_cache(struct nvk_physical_device *pdev) _mesa_sha1_update(&sha_ctx, instance->driver_build_sha, sizeof(instance->driver_build_sha)); + _mesa_sha1_update(&sha_ctx, &pdev->info.chipset, + sizeof(pdev->info.chipset)); + const uint64_t compiler_flags = nvk_physical_device_compiler_flags(pdev); _mesa_sha1_update(&sha_ctx, &compiler_flags, sizeof(compiler_flags));