From 906012105094d401b8eb27dd35bd4d0504ca5d48 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 6 Jun 2024 10:26:25 +1000 Subject: [PATCH] nvk: Only enable WSI modifiers if the extension is supported. The extension relies on the kernel being new, so don't tell wsi about it. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11270 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11166 Fixes: e6f77defec0d ("nvk/wsi: Advertise modifier support") Part-of: (cherry picked from commit 726838620ebdd890edf481d7821edc0728b1ebe4) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_wsi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 55be213ebe2..d507445d9e6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -164,7 +164,7 @@ "description": "nvk: Only enable WSI modifiers if the extension is supported.", "nominated": false, "nomination_type": 1, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": "e6f77defec0d61f9f5851bdbda5bf4cc97cd1cea", "notes": null diff --git a/src/nouveau/vulkan/nvk_wsi.c b/src/nouveau/vulkan/nvk_wsi.c index 6c9c459ad36..11c554721ac 100644 --- a/src/nouveau/vulkan/nvk_wsi.c +++ b/src/nouveau/vulkan/nvk_wsi.c @@ -29,7 +29,8 @@ nvk_init_wsi(struct nvk_physical_device *pdev) return result; pdev->wsi_device.supports_scanout = false; - pdev->wsi_device.supports_modifiers = true; + pdev->wsi_device.supports_modifiers = + pdev->vk.supported_extensions.table.EXT_image_drm_format_modifier; pdev->vk.wsi_device = &pdev->wsi_device;