diff --git a/.pick_status.json b/.pick_status.json
index 5be7afcb4ec..a28cf6665db 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -524,7 +524,7 @@
         "description": "gallium/dri: Return __DRI_ATTRIB_SWAP_UNDEFINED for _SWAP_METHOD",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e64ab3e4a94c4e8baee3bec3a5eb4d098b8e7193",
         "notes": null
diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 2476121634a..201fc7f63d4 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -326,7 +326,7 @@ driGetConfigAttribIndex(const __DRIconfig *config,
          * for the X server's sake, and EGL will expect us to handle it because
          * it iterates all __DRI_ATTRIBs.
          */
-        *value = __DRI_ATTRIB_SWAP_EXCHANGE;
+        *value = __DRI_ATTRIB_SWAP_UNDEFINED;
         break;
     case __DRI_ATTRIB_MAX_SWAP_INTERVAL:
         *value = INT_MAX;