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

r300g: fix a possible race when counting contexts 

Atomics aren't sufficient here.
This commit is contained in:
Marek Olšák 2011-02-19 00:16:44 +01:00
parent e9e5380f22
commit 0b436cf511
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/r300/r300_context.c
View File

@ -38,19 +38,21 @@
static void r300_update_num_contexts(struct r300_screen *r300screen,
int diff)
{
pipe_mutex_lock(r300screen->num_contexts_mutex);
if (diff > 0) {
p_atomic_inc(&r300screen->num_contexts);
r300screen->num_contexts++;
if (r300screen->num_contexts > 1)
util_slab_set_thread_safety(&r300screen->pool_buffers,
UTIL_SLAB_MULTITHREADED);
} else {
p_atomic_dec(&r300screen->num_contexts);
r300screen->num_contexts--;
if (r300screen->num_contexts <= 1)
util_slab_set_thread_safety(&r300screen->pool_buffers,
UTIL_SLAB_SINGLETHREADED);
}
pipe_mutex_unlock(r300screen->num_contexts_mutex);
}
static void r300_release_referenced_objects(struct r300_context *r300)

3
src/gallium/drivers/r300/r300_screen.c
View File

@ -398,6 +398,7 @@ static void r300_destroy_screen(struct pipe_screen* pscreen)
struct r300_winsys_screen *rws = r300_winsys_screen(pscreen);
util_slab_destroy(&r300screen->pool_buffers);
pipe_mutex_destroy(r300screen->num_contexts_mutex);
if (rws)
rws->destroy(rws);
@ -459,6 +460,8 @@ struct pipe_screen* r300_screen_create(struct r300_winsys_screen *rws)
r300screen->caps.is_r500 &&
rws->get_value(rws, R300_VID_DRM_2_3_0);
pipe_mutex_init(r300screen->num_contexts_mutex);
util_slab_create(&r300screen->pool_buffers,
sizeof(struct r300_resource), 64,
UTIL_SLAB_SINGLETHREADED);

1
src/gallium/drivers/r300/r300_screen.h
View File

@ -52,6 +52,7 @@ struct r300_screen {
/* The number of created contexts to know whether we have multiple
* contexts or not. */
int num_contexts;
pipe_mutex num_contexts_mutex;
};