From 83b9055811d2c088735de63d0d68e87bcab11d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Tue, 21 Apr 2026 07:41:30 +0300
Subject: [PATCH] drirc: use anv_disable_drm_ccs_modifiers for any GTK version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/work_items/15297
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
(cherry picked from commit a76e3c26164aa4b281146f89cc9ffe4dea83965b)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41269>
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b7f4b52f5f9..452d864894d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2894,7 +2894,7 @@
         "description": "drirc: use anv_disable_drm_ccs_modifiers for any GTK version",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 9d4ccac408b..c37bfc3645c 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1151,7 +1151,7 @@ TODO: document the other workarounds.
         <engine engine_name_match="GTK" engine_versions="16777216:16859138">
             <option name="vk_wsi_disable_unordered_submits" value="true" />
         </engine>
-        <engine engine_name_match="GTK" engine_versions="16777216:16859138">
+        <engine engine_name_match="GTK">
             <option name="anv_disable_drm_ccs_modifiers" value="true" />
         </engine>
         <!--