diff --git a/.pick_status.json b/.pick_status.json
index 7fc24099163..b570b1009bf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -254,7 +254,7 @@
         "description": "llvmpipe: Init eglQueryDmaBufModifiersEXT num_modifiers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d74ea2c117fe96e527471e572336f931c3c77da1",
         "notes": null
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index 6e86a6da06c..fc3c79ab8fe 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -1454,10 +1454,10 @@ llvmpipe_resource_get_param(struct pipe_screen *screen,
 static void
 llvmpipe_query_dmabuf_modifiers(struct pipe_screen *pscreen, enum pipe_format format, int max, uint64_t *modifiers, unsigned int *external_only, int *count)
 {
-   if (max) {
-      *count = 1;
+   *count = 1;
+
+   if (max)
       *modifiers = DRM_FORMAT_MOD_LINEAR;
-   }
 }
 
 static bool