KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeon/winsys: fix handling in radeon_drm_cs_flush v2 

Calling radeon_drm_cs_flush from multiple threads might cause deadlocks,
fix this by immediately signaling the semaphore after waiting for it.

This is a candidate for the stable branch(es).

Partially fixes: https://bugs.freedesktop.org/show_bug.cgi?id=70123

v2: some fixes on commit message

Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Christian König 2013-10-07 12:08:29 +02:00
parent a922d3413f
commit 8bc7673ef8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
View File

@ -178,7 +178,7 @@ static struct radeon_winsys_cs *radeon_drm_cs_create(struct radeon_winsys *rws,
if (!cs) {
return NULL;
}
pipe_semaphore_init(&cs->flush_completed, 0);
pipe_semaphore_init(&cs->flush_completed, 1);
cs->ws = ws;
cs->trace_buf = (struct radeon_bo*)trace_buf;
@ -453,9 +453,9 @@ void radeon_drm_cs_sync_flush(struct radeon_winsys_cs *rcs)
struct radeon_drm_cs *cs = radeon_drm_cs(rcs);
/* Wait for any pending ioctl to complete. */
if (cs->ws->thread && cs->flush_started) {
if (cs->ws->thread) {
pipe_semaphore_wait(&cs->flush_completed);
cs->flush_started = 0;
pipe_semaphore_signal(&cs->flush_completed);
}
}
@ -567,7 +567,7 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, unsigned flags, ui
}
if (cs->ws->thread) {
cs->flush_started = 1;
pipe_semaphore_wait(&cs->flush_completed);
radeon_drm_ws_queue_cs(cs->ws, cs);
if (!(flags & RADEON_FLUSH_ASYNC))
radeon_drm_cs_sync_flush(rcs);

1
src/gallium/winsys/radeon/drm/radeon_drm_cs.h
View File

@ -76,7 +76,6 @@ struct radeon_drm_cs {
void (*flush_cs)(void *ctx, unsigned flags);
void *flush_data;
int flush_started;
pipe_semaphore flush_completed;
struct radeon_bo *trace_buf;
};