diff --git a/.pick_status.json b/.pick_status.json
index 6b896cd0ad1..6cd309f9077 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2274,7 +2274,7 @@
         "description": "intel/isl: warn about excessive num_elements only once",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f3c7e14f091a21aebb9449f32e3483c28d39fa9c",
         "notes": null
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index b1a3ca4074a..492069949f7 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -1063,8 +1063,8 @@ isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state,
        * newer are enough to fit 32bit num_elements.
        */
       if (num_elements > (1 << 27)) {
-         mesa_logw("%s: num_elements is too big: %"PRIu64" (buffer size: %"PRIu64")\n",
-                   __func__, num_elements, buffer_size);
+         mesa_logw_once("%s: num_elements is too big: %"PRIu64" (buffer size: %"PRIu64")\n",
+                        __func__, num_elements, buffer_size);
       }
    }