diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 639e57b5c85..053815a4416 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -39,10 +39,6 @@ static bool do_winsys_init(struct amdgpu_winsys *aws,
    if (!ac_query_gpu_info(fd, aws->dev, &aws->info, false))
       goto fail;
 
-   /* TODO: Enable this once the kernel handles it efficiently. */
-   if (aws->info.has_dedicated_vram)
-      aws->info.has_local_buffers = false;
-
    aws->addrlib = ac_addrlib_create(&aws->info, &aws->info.max_alignment);
    if (!aws->addrlib) {
       fprintf(stderr, "amdgpu: Cannot create addrlib.\n");
@@ -65,6 +61,10 @@ static bool do_winsys_init(struct amdgpu_winsys *aws,
    for (unsigned i = 0; i < ARRAY_SIZE(aws->queues); i++)
       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)
+      aws->info.has_local_buffers = false;
+
    return true;
 
 fail: