fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

drm: Replace usage of mtx_t with simple_mtx_t in nouveau_drm_winsys.c

Browse source 
This is a prepare for removing _MTX_INITIALIZER_NP.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21284>
This commit is contained in:
Yonggang Luo 2023-02-10 14:45:43 +08:00 • committed by Marge Bot
parent efeb33ab10
commit 9260f9c51a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
View file

@ -5,6 +5,7 @@
#include "pipe/p_state.h"
#include "util/format/u_format.h"
#include "util/os_file.h"
#include "util/simple_mtx.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_hash_table.h"
@ -21,7 +22,7 @@
static struct hash_table *fd_tab = NULL;
static mtx_t nouveau_screen_mutex = _MTX_INITIALIZER_NP;
static simple_mtx_t nouveau_screen_mutex = SIMPLE_MTX_INITIALIZER;
bool nouveau_drm_screen_unref(struct nouveau_screen *screen)
{
@ -29,12 +30,12 @@ bool nouveau_drm_screen_unref(struct nouveau_screen *screen)
if (screen->refcount == -1)
return true;
mtx_lock(&nouveau_screen_mutex);
simple_mtx_lock(&nouveau_screen_mutex);
ret = --screen->refcount;
assert(ret >= 0);
if (ret == 0)
_mesa_hash_table_remove_key(fd_tab, intptr_to_pointer(screen->drm->fd));
mtx_unlock(&nouveau_screen_mutex);
simple_mtx_unlock(&nouveau_screen_mutex);
return ret == 0;
}
@ -47,11 +48,11 @@ nouveau_drm_screen_create(int fd)
struct nouveau_screen *screen = NULL;
int ret, dupfd;
mtx_lock(&nouveau_screen_mutex);
simple_mtx_lock(&nouveau_screen_mutex);
if (!fd_tab) {
fd_tab = util_hash_table_create_fd_keys();
if (!fd_tab) {
mtx_unlock(&nouveau_screen_mutex);
simple_mtx_unlock(&nouveau_screen_mutex);
return NULL;
}
}
@ -59,7 +60,7 @@ nouveau_drm_screen_create(int fd)
screen = util_hash_table_get(fd_tab, intptr_to_pointer(fd));
if (screen) {
screen->refcount++;
mtx_unlock(&nouveau_screen_mutex);
simple_mtx_unlock(&nouveau_screen_mutex);
return &screen->base;
}
@ -126,7 +127,7 @@ nouveau_drm_screen_create(int fd)
*/
_mesa_hash_table_insert(fd_tab, intptr_to_pointer(dupfd), screen);
screen->refcount = 1;
mtx_unlock(&nouveau_screen_mutex);
simple_mtx_unlock(&nouveau_screen_mutex);
return &screen->base;
err:
@ -137,6 +138,6 @@ err:
nouveau_drm_del(&drm);
close(dupfd);
}
mtx_unlock(&nouveau_screen_mutex);
simple_mtx_unlock(&nouveau_screen_mutex);
return NULL;
}