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

etnaviv: use simple_mtx to avoid breaking windows in the next commit

Browse Source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20180>
This commit is contained in:
Eric Engestrom
2022-12-09 20:52:15 +00:00
committed by Marge Bot
parent a72035f9c5
commit 1dea6aea20
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c
+6 -5
View File
@@ -27,6 +27,7 @@
#include <sys/stat.h>
#include "util/os_file.h"
#include "util/simple_mtx.h"
#include "util/u_hash_table.h"
#include "util/u_pointer.h"
@@ -128,7 +129,7 @@ screen_create(int gpu_fd, struct renderonly *ro)
static struct hash_table *fd_tab = NULL;
static mtx_t etna_screen_mutex = _MTX_INITIALIZER_NP;
static simple_mtx_t etna_screen_mutex = SIMPLE_MTX_INITIALIZER;
static void
etna_drm_screen_destroy(struct pipe_screen *pscreen)
@@ -136,7 +137,7 @@ etna_drm_screen_destroy(struct pipe_screen *pscreen)
struct etna_screen *screen = etna_screen(pscreen);
boolean destroy;
mtx_lock(&etna_screen_mutex);
simple_mtx_lock(&etna_screen_mutex);
destroy = --screen->refcnt == 0;
if (destroy) {
int fd = etna_device_fd(screen->dev);
@@ -147,7 +148,7 @@ etna_drm_screen_destroy(struct pipe_screen *pscreen)
fd_tab = NULL;
}
}
mtx_unlock(&etna_screen_mutex);
simple_mtx_unlock(&etna_screen_mutex);
if (destroy) {
pscreen->destroy = screen->winsys_priv;
@@ -160,7 +161,7 @@ etna_lookup_or_create_screen(int gpu_fd, struct renderonly *ro)
{
struct pipe_screen *pscreen = NULL;
mtx_lock(&etna_screen_mutex);
simple_mtx_lock(&etna_screen_mutex);
if (!fd_tab) {
fd_tab = hash_table_create_file_description_keys();
if (!fd_tab)
@@ -185,7 +186,7 @@ etna_lookup_or_create_screen(int gpu_fd, struct renderonly *ro)
}
unlock:
mtx_unlock(&etna_screen_mutex);
simple_mtx_unlock(&etna_screen_mutex);
return pscreen;
}