7 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index c4f2c57d1cf..1ad15b53b7a 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -1930,7 +1930,7 @@ dri2_init_screen(__DRIscreen * sPriv)
 
    screen->sPriv = sPriv;
    screen->fd = sPriv->fd;
-   pipe_mutex_init(screen->opencl_func_mutex);
+   (void) mtx_init(&screen->opencl_func_mutex, mtx_plain);
 
    sPriv->driverPrivate = (void *)screen;
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 9297b689050..92d2cec0284 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -242,7 +242,7 @@ xmesa_init_display( Display *display )
    }
 
    if (xmdpy->screen && xmdpy->smapi) {
-      pipe_mutex_init(xmdpy->mutex);
+      (void) mtx_init(&xmdpy->mutex, mtx_plain);
    }
    else {
       if (xmdpy->screen) {
diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/state_trackers/nine/nine_queue.c
index 4724b6be584..30b0e303c0f 100644
--- a/src/gallium/state_trackers/nine/nine_queue.c
+++ b/src/gallium/state_trackers/nine/nine_queue.c
@@ -241,10 +241,10 @@ nine_queue_create(void)
     }
 
     cnd_init(&ctx->event_pop);
-    pipe_mutex_init(ctx->mutex_pop);
+    (void) mtx_init(&ctx->mutex_pop, mtx_plain);
 
     cnd_init(&ctx->event_push);
-    pipe_mutex_init(ctx->mutex_push);
+    (void) mtx_init(&ctx->mutex_push, mtx_plain);
 
     /* Block until first cmdbuf has been flushed. */
     ctx->worker_wait = TRUE;
diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index 231e42272ec..a331f7ca8d6 100644
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -152,9 +152,9 @@ nine_csmt_create( struct NineDevice9 *This )
         return NULL;
     }
     cnd_init(&ctx->event_processed);
-    pipe_mutex_init(ctx->mutex_processed);
-    pipe_mutex_init(ctx->thread_running);
-    pipe_mutex_init(ctx->thread_resume);
+    (void) mtx_init(&ctx->mutex_processed, mtx_plain);
+    (void) mtx_init(&ctx->thread_running, mtx_plain);
+    (void) mtx_init(&ctx->thread_resume, mtx_plain);
 
 #if DEBUG
     pipe_thread_setname("Main thread");
diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
index d749e65308e..84bb805d8fa 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -163,7 +163,7 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
    vl_csc_get_matrix(VL_CSC_COLOR_STANDARD_BT_601, NULL, true, &drv->csc);
    if (!vl_compositor_set_csc_matrix(&drv->cstate, (const vl_csc_matrix *)&drv->csc, 1.0f, 0.0f))
       goto error_csc_matrix;
-   pipe_mutex_init(drv->mutex);
+   (void) mtx_init(&drv->mutex, mtx_plain);
 
    ctx->pDriverData = (void *)drv;
    ctx->version_major = 0;
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c
index f85bce823bb..628e5030c5a 100644
--- a/src/gallium/state_trackers/vdpau/decode.c
+++ b/src/gallium/state_trackers/vdpau/decode.c
@@ -136,7 +136,7 @@ vlVdpDecoderCreate(VdpDevice device,
       goto error_handle;
    }
 
-   pipe_mutex_init(vldecoder->mutex);
+   (void) mtx_init(&vldecoder->mutex, mtx_plain);
    pipe_mutex_unlock(dev->mutex);
 
    return VDP_STATUS_OK;
diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c
index 4f4ffdffe7d..15652f08bf8 100644
--- a/src/gallium/state_trackers/vdpau/device.c
+++ b/src/gallium/state_trackers/vdpau/device.c
@@ -133,7 +133,7 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
        goto no_compositor;
    }
 
-   pipe_mutex_init(dev->mutex);
+   (void) mtx_init(&dev->mutex, mtx_plain);
 
    *get_proc_address = &vlVdpGetProcAddress;