fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 20:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium/u_queue: allow the execute function to differ per job

Browse source 
so that independent types of jobs can use the same queue.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-06-11 17:28:52 +02:00
parent 4a06786efd
commit cbb5adb908
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/auxiliary/util/u_queue.c
View file

@ -84,7 +84,7 @@ static PIPE_THREAD_ROUTINE(util_queue_thread_func, input)
}
job = queue->jobs[queue->read_idx];
queue->jobs[queue->read_idx].job = NULL;
memset(&queue->jobs[queue->read_idx], 0, sizeof(struct util_queue_job));
queue->read_idx = (queue->read_idx + 1) % queue->max_jobs;
queue->num_queued--;
@ -92,7 +92,7 @@ static PIPE_THREAD_ROUTINE(util_queue_thread_func, input)
pipe_mutex_unlock(queue->lock);
if (job.job) {
queue->execute_job(job.job, thread_index);
job.execute(job.job, thread_index);
util_queue_fence_signal(job.fence);
}
}
@ -113,8 +113,7 @@ bool
util_queue_init(struct util_queue *queue,
const char *name,
unsigned max_jobs,
unsigned num_threads,
void (*execute_job)(void *, int))
unsigned num_threads)
{
unsigned i;
@ -128,7 +127,6 @@ util_queue_init(struct util_queue *queue,
if (!queue->jobs)
goto fail;
queue->execute_job = execute_job;
pipe_mutex_init(queue->lock);
queue->num_queued = 0;
@ -216,7 +214,8 @@ util_queue_fence_destroy(struct util_queue_fence *fence)
void
util_queue_add_job(struct util_queue *queue,
void *job,
struct util_queue_fence *fence)
struct util_queue_fence *fence,
util_queue_execute_func execute)
{
struct util_queue_job *ptr;
@ -234,6 +233,7 @@ util_queue_add_job(struct util_queue *queue,
assert(ptr->job == NULL);
ptr->job = job;
ptr->fence = fence;
ptr->execute = execute;
queue->write_idx = (queue->write_idx + 1) % queue->max_jobs;
queue->num_queued++;

10
src/gallium/auxiliary/util/u_queue.h
View file

@ -44,9 +44,12 @@ struct util_queue_fence {
int signalled;
};
typedef void (*util_queue_execute_func)(void *job, int thread_index);
struct util_queue_job {
void *job;
struct util_queue_fence *fence;
util_queue_execute_func execute;
};
/* Put this into your context. */
@ -62,21 +65,20 @@ struct util_queue {
int max_jobs;
int write_idx, read_idx; /* ring buffer pointers */
struct util_queue_job *jobs;
void (*execute_job)(void *job, int thread_index);
};
bool util_queue_init(struct util_queue *queue,
const char *name,
unsigned max_jobs,
unsigned num_threads,
void (*execute_job)(void *, int));
unsigned num_threads);
void util_queue_destroy(struct util_queue *queue);
void util_queue_fence_init(struct util_queue_fence *fence);
void util_queue_fence_destroy(struct util_queue_fence *fence);
void util_queue_add_job(struct util_queue *queue,
void *job,
struct util_queue_fence *fence);
struct util_queue_fence *fence,
util_queue_execute_func execute);
void util_queue_job_wait(struct util_queue_fence *fence);
/* util_queue needs to be cleared to zeroes for this to work */

3
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
View file

@ -1052,7 +1052,8 @@ static void amdgpu_cs_flush(struct radeon_winsys_cs *rcs,
/* Submit. */
if ((flags & RADEON_FLUSH_ASYNC) &&
util_queue_is_initialized(&ws->cs_queue)) {
util_queue_add_job(&ws->cs_queue, cs, &cs->flush_completed);
util_queue_add_job(&ws->cs_queue, cs, &cs->flush_completed,
amdgpu_cs_submit_ib);
} else {
amdgpu_cs_submit_ib(cs, 0);
}

2
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View file

@ -493,7 +493,7 @@ amdgpu_winsys_create(int fd, radeon_screen_create_t screen_create)
pipe_mutex_init(ws->bo_fence_lock);
if (sysconf(_SC_NPROCESSORS_ONLN) > 1 && debug_get_option_thread())
util_queue_init(&ws->cs_queue, "amdgpu_cs", 8, 1, amdgpu_cs_submit_ib);
util_queue_init(&ws->cs_queue, "amdgpu_cs", 8, 1);
/* Create the screen at the end. The winsys must be initialized
* completely.

3
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
View file

@ -586,7 +586,8 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs,
}
if (util_queue_is_initialized(&cs->ws->cs_queue)) {
util_queue_add_job(&cs->ws->cs_queue, cs, &cs->flush_completed);
util_queue_add_job(&cs->ws->cs_queue, cs, &cs->flush_completed,
radeon_drm_cs_emit_ioctl_oneshot);
if (!(flags & RADEON_FLUSH_ASYNC))
radeon_drm_cs_sync_flush(rcs);
} else {

3
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
View file

@ -783,8 +783,7 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
ws->info.gart_page_size = sysconf(_SC_PAGESIZE);
if (ws->num_cpus > 1 && debug_get_option_thread())
util_queue_init(&ws->cs_queue, "radeon_cs", 8, 1,
radeon_drm_cs_emit_ioctl_oneshot);
util_queue_init(&ws->cs_queue, "radeon_cs", 8, 1);
/* Create the screen at the end. The winsys must be initialized
* completely.