diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index be1a45d0d38..ba5df92f630 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -998,7 +998,7 @@ enumerate_devices(struct vk_instance *vk_instance)
    struct v3dv_instance *instance =
       container_of(vk_instance, struct v3dv_instance, vk);
 
-   /* TODO: Check for more devices? */
+   /* FIXME: Check for more devices? */
    drmDevicePtr devices[8];
    int max_devices;
 
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 5a7f01257da..d94eeef260e 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -1906,7 +1906,7 @@ v3dv_pipeline_layout_unref(struct v3dv_device *device,
 
 
 struct v3dv_descriptor_map {
-   /* TODO: avoid fixed size array/justify the size */
+   /* FIXME: avoid fixed size array/justify the size */
    unsigned num_desc; /* Number of descriptors  */
    int set[DESCRIPTOR_MAP_SIZE];
    int binding[DESCRIPTOR_MAP_SIZE];
diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
index 6147d6aef5a..538912f641c 100644
--- a/src/gallium/drivers/v3d/v3dx_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -864,7 +864,7 @@ v3dX(emit_rcl)(struct v3d_job *job)
 #endif
 
 #if V3D_VERSION < 40
-        /* TODO: Don't bother emitting if we don't load/clear Z/S. */
+        /* FIXME: Don't bother emitting if we don't load/clear Z/S. */
         if (job->zsbuf) {
                 struct pipe_surface *psurf = job->zsbuf;
                 struct v3d_surface *surf = v3d_surface(psurf);