diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c
index 7fb24d39046..e103cf2a8bd 100644
--- a/src/gallium/drivers/llvmpipe/lp_fence.c
+++ b/src/gallium/drivers/llvmpipe/lp_fence.c
@@ -44,7 +44,7 @@
 struct lp_fence *
 lp_fence_create(unsigned rank)
 {
-   static _Atomic int fence_id;
+   static unsigned fence_id = 0;
    struct lp_fence *fence = CALLOC_STRUCT(lp_fence);
 
    if (!fence)
@@ -55,7 +55,7 @@ lp_fence_create(unsigned rank)
    (void) mtx_init(&fence->mutex, mtx_plain);
    cnd_init(&fence->signalled);
 
-   fence->id = fence_id++;
+   fence->id = p_atomic_inc_return(&fence_id) - 1;
    fence->rank = rank;
 
    if (LP_DEBUG & DEBUG_FENCE)