From ba72554f3e576c1674d52ab16d8d2edff9398b71 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 5 Mar 2017 12:12:30 +1100 Subject: gallium/util: replace pipe_mutex_lock() with mtx_lock() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12. Replaced using: find ./src -type f -exec sed -i -- \ 's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \; Reviewed-by: Marek Olšák --- src/gallium/state_trackers/va/buffer.c | 18 +++++++++--------- src/gallium/state_trackers/va/config.c | 8 ++++---- src/gallium/state_trackers/va/context.c | 6 +++--- src/gallium/state_trackers/va/image.c | 10 +++++----- src/gallium/state_trackers/va/picture.c | 8 ++++---- src/gallium/state_trackers/va/subpicture.c | 10 +++++----- src/gallium/state_trackers/va/surface.c | 10 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/gallium/state_trackers/va') diff --git a/src/gallium/state_trackers/va/buffer.c b/src/gallium/state_trackers/va/buffer.c index 93f012c830f..b9bf6f0add1 100644 --- a/src/gallium/state_trackers/va/buffer.c +++ b/src/gallium/state_trackers/va/buffer.c @@ -64,7 +64,7 @@ vlVaCreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, memcpy(buf->data, data, size * num_elements); drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); *buf_id = handle_table_add(drv->htab, buf); pipe_mutex_unlock(drv->mutex); @@ -82,7 +82,7 @@ vlVaBufferSetNumElements(VADriverContextP ctx, VABufferID buf_id, return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); pipe_mutex_unlock(drv->mutex); if (!buf) @@ -117,7 +117,7 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff) if (!pbuff) return VA_STATUS_ERROR_INVALID_PARAMETER; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf || buf->export_refcount > 0) { pipe_mutex_unlock(drv->mutex); @@ -160,7 +160,7 @@ vlVaUnmapBuffer(VADriverContextP ctx, VABufferID buf_id) if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf || buf->export_refcount > 0) { pipe_mutex_unlock(drv->mutex); @@ -191,7 +191,7 @@ vlVaDestroyBuffer(VADriverContextP ctx, VABufferID buf_id) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf) { pipe_mutex_unlock(drv->mutex); @@ -220,7 +220,7 @@ vlVaBufferInfo(VADriverContextP ctx, VABufferID buf_id, VABufferType *type, return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); pipe_mutex_unlock(drv->mutex); if (!buf) @@ -254,7 +254,7 @@ vlVaAcquireBufferHandle(VADriverContextP ctx, VABufferID buf_id, drv = VL_VA_DRIVER(ctx); screen = VL_VA_PSCREEN(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(VL_VA_DRIVER(ctx)->htab, buf_id); pipe_mutex_unlock(drv->mutex); @@ -295,7 +295,7 @@ vlVaAcquireBufferHandle(VADriverContextP ctx, VABufferID buf_id, case VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME: { struct winsys_handle whandle; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); drv->pipe->flush(drv->pipe, NULL, 0); memset(&whandle, 0, sizeof(whandle)); @@ -339,7 +339,7 @@ vlVaReleaseBufferHandle(VADriverContextP ctx, VABufferID buf_id) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); pipe_mutex_unlock(drv->mutex); diff --git a/src/gallium/state_trackers/va/config.c b/src/gallium/state_trackers/va/config.c index da52a58c5db..3d4e24bd814 100644 --- a/src/gallium/state_trackers/va/config.c +++ b/src/gallium/state_trackers/va/config.c @@ -200,7 +200,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin if (!config->rt_format) config->rt_format = VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_RGB32; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); *config_id = handle_table_add(drv->htab, config); pipe_mutex_unlock(drv->mutex); return VA_STATUS_SUCCESS; @@ -265,7 +265,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin if (!config->rt_format) config->rt_format = VA_RT_FORMAT_YUV420; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); *config_id = handle_table_add(drv->htab, config); pipe_mutex_unlock(drv->mutex); @@ -286,7 +286,7 @@ vlVaDestroyConfig(VADriverContextP ctx, VAConfigID config_id) if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); if (!config) @@ -314,7 +314,7 @@ vlVaQueryConfigAttributes(VADriverContextP ctx, VAConfigID config_id, VAProfile if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); pipe_mutex_unlock(drv->mutex); diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c index 36e314fa2b7..a3452473484 100644 --- a/src/gallium/state_trackers/va/context.c +++ b/src/gallium/state_trackers/va/context.c @@ -214,7 +214,7 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); pipe_mutex_unlock(drv->mutex); @@ -287,7 +287,7 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, if (config->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) context->desc.h264enc.rate_ctrl.rate_ctrl_method = config->rc; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); *context_id = handle_table_add(drv->htab, context); pipe_mutex_unlock(drv->mutex); @@ -304,7 +304,7 @@ vlVaDestroyContext(VADriverContextP ctx, VAContextID context_id) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { pipe_mutex_unlock(drv->mutex); diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c index 47d31de2dbe..2c7afe2a443 100644 --- a/src/gallium/state_trackers/va/image.c +++ b/src/gallium/state_trackers/va/image.c @@ -114,7 +114,7 @@ vlVaCreateImage(VADriverContextP ctx, VAImageFormat *format, int width, int heig img = CALLOC(1, sizeof(VAImage)); if (!img) return VA_STATUS_ERROR_ALLOCATION_FAILED; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); img->image_id = handle_table_add(drv->htab, img); pipe_mutex_unlock(drv->mutex); @@ -258,7 +258,7 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) return VA_STATUS_ERROR_ALLOCATION_FAILED; } - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); img->image_id = handle_table_add(drv->htab, img); img_buf->type = VAImageBufferType; @@ -286,7 +286,7 @@ vlVaDestroyImage(VADriverContextP ctx, VAImageID image) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); vaimage = handle_table_get(drv->htab, image); if (!vaimage) { pipe_mutex_unlock(drv->mutex); @@ -328,7 +328,7 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, surface); if (!surf || !surf->buffer) { pipe_mutex_unlock(drv->mutex); @@ -438,7 +438,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, surface); if (!surf || !surf->buffer) { diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index ef8b57a47f5..6a1adb27378 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -50,7 +50,7 @@ vlVaBeginPicture(VADriverContextP ctx, VAContextID context_id, VASurfaceID rende if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { pipe_mutex_unlock(drv->mutex); @@ -494,7 +494,7 @@ vlVaRenderPicture(VADriverContextP ctx, VAContextID context_id, VABufferID *buff if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { pipe_mutex_unlock(drv->mutex); @@ -569,7 +569,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); pipe_mutex_unlock(drv->mutex); if (!context) @@ -583,7 +583,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) return VA_STATUS_SUCCESS; } - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, context->target_id); context->mpeg4.frame_num++; diff --git a/src/gallium/state_trackers/va/subpicture.c b/src/gallium/state_trackers/va/subpicture.c index f546e566242..0d907586fd3 100644 --- a/src/gallium/state_trackers/va/subpicture.c +++ b/src/gallium/state_trackers/va/subpicture.c @@ -73,7 +73,7 @@ vlVaCreateSubpicture(VADriverContextP ctx, VAImageID image, return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); img = handle_table_get(drv->htab, image); if (!img) { pipe_mutex_unlock(drv->mutex); @@ -103,7 +103,7 @@ vlVaDestroySubpicture(VADriverContextP ctx, VASubpictureID subpicture) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); sub = handle_table_get(drv->htab, subpicture); if (!sub) { @@ -129,7 +129,7 @@ vlVaSubpictureImage(VADriverContextP ctx, VASubpictureID subpicture, VAImageID i return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); img = handle_table_get(drv->htab, image); if (!img) { @@ -186,7 +186,7 @@ vlVaAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, if (!ctx) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); sub = handle_table_get(drv->htab, subpicture); if (!sub) { @@ -256,7 +256,7 @@ vlVaDeassociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, if (!ctx) return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); sub = handle_table_get(drv->htab, subpicture); if (!sub) { diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c index b129e6c74f4..363ae66d0c5 100644 --- a/src/gallium/state_trackers/va/surface.c +++ b/src/gallium/state_trackers/va/surface.c @@ -70,7 +70,7 @@ vlVaDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_sur return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); for (i = 0; i < num_surfaces; ++i) { vlVaSurface *surf = handle_table_get(drv->htab, surface_list[i]); if (!surf) { @@ -102,7 +102,7 @@ vlVaSyncSurface(VADriverContextP ctx, VASurfaceID render_target) if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, render_target); if (!surf || !surf->buffer) { @@ -288,7 +288,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s return VA_STATUS_ERROR_INVALID_CONTEXT; drv = VL_VA_DRIVER(ctx); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, surface_id); if (!surf) { pipe_mutex_unlock(drv->mutex); @@ -399,7 +399,7 @@ vlVaQuerySurfaceAttributes(VADriverContextP ctx, VAConfigID config_id, if (!drv) return VA_STATUS_ERROR_INVALID_CONTEXT; - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); pipe_mutex_unlock(drv->mutex); @@ -686,7 +686,7 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format, memset(surfaces, VA_INVALID_ID, num_surfaces * sizeof(VASurfaceID)); - pipe_mutex_lock(drv->mutex); + mtx_lock(&drv->mutex); for (i = 0; i < num_surfaces; i++) { vlVaSurface *surf = CALLOC(1, sizeof(vlVaSurface)); if (!surf) -- cgit v1.2.3