diff --git a/.pick_status.json b/.pick_status.json
index 4e95a0eba69..0acecbff2fe 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 5132c6e37d4..69ba95c4b8e 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1162,9 +1162,11 @@ TODO: document the other workarounds.
         <engine engine_name_match="vkd3d">
             <option name="anv_enable_buffer_comp" value="true" />
         </engine>
+        <engine engine_name_match="GTK">
+            <option name="anv_disable_drm_ccs_modifiers" value="true" />
+        </engine>
         <engine engine_name_match="GTK" engine_versions="16777216:16859138">
             <option name="vk_wsi_disable_unordered_submits" value="true" />
-            <option name="anv_disable_drm_ccs_modifiers" value="true" />
         </engine>
         <!--
         Disable 16-bit feature on zink and angle so that GLES mediump doesn't