diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:06 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:53:05 +1100 |
commit | 628e84a58fdb26c63a705861b92f65f242613321 (patch) | |
tree | bd6084a4dee53a1f180c62f41e790ab490ddf3ee /src/gallium/drivers/radeonsi | |
parent | ba72554f3e576c1674d52ab16d8d2edff9398b71 (diff) |
gallium/util: replace pipe_mutex_unlock() with mtx_unlock()
pipe_mutex_unlock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_unlock(\([^)]*\)):mtx_unlock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 4a346538ee4..ec34235f078 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -7472,7 +7472,7 @@ si_get_shader_part(struct si_screen *sscreen, /* Find existing. */ for (result = *list; result; result = result->next) { if (memcmp(&result->key, key, sizeof(*key)) == 0) { - pipe_mutex_unlock(sscreen->shader_parts_mutex); + mtx_unlock(&sscreen->shader_parts_mutex); return result; } } @@ -7526,7 +7526,7 @@ si_get_shader_part(struct si_screen *sscreen, out: si_llvm_dispose(&ctx); - pipe_mutex_unlock(sscreen->shader_parts_mutex); + mtx_unlock(&sscreen->shader_parts_mutex); return result; } diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index c7a8d1f2afb..9cde0aabade 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1270,17 +1270,17 @@ again: if (iter->is_optimized && !util_queue_fence_is_signalled(&iter->optimized_ready)) { memset(&key->opt, 0, sizeof(key->opt)); - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); goto again; } if (iter->compilation_failed) { - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return -1; /* skip the draw call */ } state->current = iter; - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return 0; } } @@ -1288,7 +1288,7 @@ again: /* Build a new shader. */ shader = CALLOC_STRUCT(si_shader); if (!shader) { - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return -ENOMEM; } shader->selector = sel; @@ -1307,7 +1307,7 @@ again: if (!main_part) { FREE(shader); - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return -ENOMEM; /* skip the draw call */ } @@ -1320,7 +1320,7 @@ again: &compiler_state->debug) != 0) { FREE(main_part); FREE(shader); - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return -ENOMEM; /* skip the draw call */ } *mainp = main_part; @@ -1357,7 +1357,7 @@ again: /* Use the default (unoptimized) shader for now. */ memset(&key->opt, 0, sizeof(key->opt)); - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); goto again; } @@ -1367,7 +1367,7 @@ again: if (!shader->compilation_failed) state->current = shader; - pipe_mutex_unlock(sel->mutex); + mtx_unlock(&sel->mutex); return shader->compilation_failed ? -1 : 0; } @@ -1461,9 +1461,9 @@ void si_init_shader_selector_async(void *job, int thread_index) if (tgsi_binary && si_shader_cache_load_shader(sscreen, tgsi_binary, shader)) { - pipe_mutex_unlock(sscreen->shader_cache_mutex); + mtx_unlock(&sscreen->shader_cache_mutex); } else { - pipe_mutex_unlock(sscreen->shader_cache_mutex); + mtx_unlock(&sscreen->shader_cache_mutex); /* Compile the shader if it hasn't been loaded from the cache. */ if (si_compile_tgsi_shader(sscreen, tm, shader, false, @@ -1478,7 +1478,7 @@ void si_init_shader_selector_async(void *job, int thread_index) mtx_lock(&sscreen->shader_cache_mutex); if (!si_shader_cache_insert_shader(sscreen, tgsi_binary, shader, true)) FREE(tgsi_binary); - pipe_mutex_unlock(sscreen->shader_cache_mutex); + mtx_unlock(&sscreen->shader_cache_mutex); } } |