diff --git a/.pick_status.json b/.pick_status.json
index 9404283e56c..99df2fb30c2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "winsys/amdgpu: disable VM_ALWAYS_VALID",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8c91624614c1f939974fe0d2d1a3baf83335cecb",
         "notes": null
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 1a4cfea8914..e107220bed7 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -62,7 +62,7 @@ static bool do_winsys_init(struct amdgpu_winsys *aws,
       simple_mtx_init(&aws->queues[i].userq.lock, mtx_plain);
 
    /* TODO: Enable this once the kernel handles it efficiently. */
-   if (aws->info.has_dedicated_vram && !aws->info.use_userq)
+   if (!aws->info.use_userq)
       aws->info.has_local_buffers = false;
 
    return true;