diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h
index d59c077d33d..3d9a4512ba5 100644
--- a/src/gallium/frontends/lavapipe/lvp_private.h
+++ b/src/gallium/frontends/lavapipe/lvp_private.h
@@ -114,7 +114,7 @@ void __lvp_finishme(const char *file, int line, const char *format, ...)
    } while (0)
 
 #define LVP_SHADER_STAGES MESA_SHADER_STAGES
-#define LVP_STAGE_MASK ((1 << LVP_SHADER_STAGES) - 1)
+#define LVP_STAGE_MASK BITFIELD_MASK(LVP_SHADER_STAGES)
 
 #define lvp_foreach_stage(stage, stage_bits)                         \
    for (gl_shader_stage stage,                                       \