gallium/util: replace pipe_condvar_wait() with cnd_wait()
pipe_condvar_wait() was made unnecessary with fd33a6bcd7
.
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
1e0314281a
commit
74c879ac75
|
@ -148,9 +148,6 @@ __pipe_mutex_assert_locked(pipe_mutex *mutex)
|
|||
*/
|
||||
typedef cnd_t pipe_condvar;
|
||||
|
||||
#define pipe_condvar_wait(cond, mutex) \
|
||||
cnd_wait(&(cond), &(mutex))
|
||||
|
||||
#define pipe_condvar_signal(cond) \
|
||||
cnd_signal(&(cond))
|
||||
|
||||
|
@ -219,7 +216,7 @@ static inline void pipe_barrier_wait(pipe_barrier *barrier)
|
|||
uint64_t sequence = barrier->sequence;
|
||||
|
||||
do {
|
||||
pipe_condvar_wait(barrier->condvar, barrier->mutex);
|
||||
cnd_wait(&barrier->condvar, &barrier->mutex);
|
||||
} while (sequence == barrier->sequence);
|
||||
} else {
|
||||
barrier->waiters = 0;
|
||||
|
@ -277,7 +274,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
|
|||
{
|
||||
pipe_mutex_lock(sema->mutex);
|
||||
while (sema->counter <= 0) {
|
||||
pipe_condvar_wait(sema->cond, sema->mutex);
|
||||
cnd_wait(&sema->cond, &sema->mutex);
|
||||
}
|
||||
sema->counter--;
|
||||
pipe_mutex_unlock(sema->mutex);
|
||||
|
|
|
@ -105,7 +105,7 @@ util_queue_fence_wait(struct util_queue_fence *fence)
|
|||
{
|
||||
pipe_mutex_lock(fence->mutex);
|
||||
while (!fence->signalled)
|
||||
pipe_condvar_wait(fence->cond, fence->mutex);
|
||||
cnd_wait(&fence->cond, &fence->mutex);
|
||||
pipe_mutex_unlock(fence->mutex);
|
||||
}
|
||||
|
||||
|
@ -156,7 +156,7 @@ static PIPE_THREAD_ROUTINE(util_queue_thread_func, input)
|
|||
|
||||
/* wait if the queue is empty */
|
||||
while (!queue->kill_threads && queue->num_queued == 0)
|
||||
pipe_condvar_wait(queue->has_queued_cond, queue->lock);
|
||||
cnd_wait(&queue->has_queued_cond, &queue->lock);
|
||||
|
||||
if (queue->kill_threads) {
|
||||
pipe_mutex_unlock(queue->lock);
|
||||
|
@ -305,7 +305,7 @@ util_queue_add_job(struct util_queue *queue,
|
|||
|
||||
/* if the queue is full, wait until there is space */
|
||||
while (queue->num_queued == queue->max_jobs)
|
||||
pipe_condvar_wait(queue->has_space_cond, queue->lock);
|
||||
cnd_wait(&queue->has_space_cond, &queue->lock);
|
||||
|
||||
ptr = &queue->jobs[queue->write_idx];
|
||||
assert(ptr->job == NULL);
|
||||
|
|
|
@ -85,7 +85,7 @@ void util_ringbuffer_enqueue( struct util_ringbuffer *ring,
|
|||
/* Wait for free space:
|
||||
*/
|
||||
while (util_ringbuffer_space(ring) < packet->dwords)
|
||||
pipe_condvar_wait(ring->change, ring->mutex);
|
||||
cnd_wait(&ring->change, &ring->mutex);
|
||||
|
||||
/* Copy data to ring:
|
||||
*/
|
||||
|
@ -123,7 +123,7 @@ enum pipe_error util_ringbuffer_dequeue( struct util_ringbuffer *ring,
|
|||
*/
|
||||
if (wait) {
|
||||
while (util_ringbuffer_empty(ring))
|
||||
pipe_condvar_wait(ring->change, ring->mutex);
|
||||
cnd_wait(&ring->change, &ring->mutex);
|
||||
}
|
||||
else {
|
||||
if (util_ringbuffer_empty(ring)) {
|
||||
|
|
|
@ -119,7 +119,7 @@ lp_fence_wait(struct lp_fence *f)
|
|||
pipe_mutex_lock(f->mutex);
|
||||
assert(f->issued);
|
||||
while (f->count < f->rank) {
|
||||
pipe_condvar_wait(f->signalled, f->mutex);
|
||||
cnd_wait(&f->signalled, &f->mutex);
|
||||
}
|
||||
pipe_mutex_unlock(f->mutex);
|
||||
}
|
||||
|
|
|
@ -108,7 +108,7 @@ rbug_draw_block_locked(struct rbug_context *rb_pipe, int flag)
|
|||
/* wait for rbug to clear the blocked flag */
|
||||
while (rb_pipe->draw_blocked & flag) {
|
||||
rb_pipe->draw_blocked |= flag;
|
||||
pipe_condvar_wait(rb_pipe->draw_cond, rb_pipe->draw_mutex);
|
||||
cnd_wait(&rb_pipe->draw_cond, &rb_pipe->draw_mutex);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -89,7 +89,7 @@ nine_queue_wait_flush(struct nine_queue_pool* ctx)
|
|||
while (!cmdbuf->full)
|
||||
{
|
||||
DBG("waiting for full cmdbuf\n");
|
||||
pipe_condvar_wait(ctx->event_push, ctx->mutex_push);
|
||||
cnd_wait(&ctx->event_push, &ctx->mutex_push);
|
||||
}
|
||||
DBG("got cmdbuf=%p\n", cmdbuf);
|
||||
pipe_mutex_unlock(ctx->mutex_push);
|
||||
|
@ -162,7 +162,7 @@ nine_queue_flush(struct nine_queue_pool* ctx)
|
|||
while (cmdbuf->full)
|
||||
{
|
||||
DBG("waiting for empty cmdbuf\n");
|
||||
pipe_condvar_wait(ctx->event_pop, ctx->mutex_pop);
|
||||
cnd_wait(&ctx->event_pop, &ctx->mutex_pop);
|
||||
}
|
||||
DBG("got empty cmdbuf=%p\n", cmdbuf);
|
||||
pipe_mutex_unlock(ctx->mutex_pop);
|
||||
|
|
|
@ -81,7 +81,7 @@ nine_csmt_wait_processed(struct csmt_context *ctx)
|
|||
{
|
||||
pipe_mutex_lock(ctx->mutex_processed);
|
||||
while (!p_atomic_read(&ctx->processed)) {
|
||||
pipe_condvar_wait(ctx->event_processed, ctx->mutex_processed);
|
||||
cnd_wait(&ctx->event_processed, &ctx->mutex_processed);
|
||||
}
|
||||
pipe_mutex_unlock(ctx->mutex_processed);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue