Module: Mesa Branch: staging/20.2 Commit: 3577ac21ba9b2a9d4fec9a071635183fea9a3c0e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3577ac21ba9b2a9d4fec9a071635183fea9a3c0e
Author: Christian Gmeiner <[email protected]> Date: Tue Dec 1 11:50:22 2020 +0100 etnaviv/drm: fix evil-twin etna_drm_table_lock Cc: <[email protected]> Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Lucas Stach <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7832> (cherry picked from commit aad0c7c6b8e73141f5dd5aed0c091efd5dba5b99) --- .pick_status.json | 2 +- src/etnaviv/drm/etnaviv_bo_cache.c | 1 - src/etnaviv/drm/etnaviv_device.c | 2 -- src/etnaviv/drm/etnaviv_priv.h | 2 ++ 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3c388938263..341e2f29f99 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "etnaviv/drm: fix evil-twin etna_drm_table_lock", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c index 93893b52b23..185ae525435 100644 --- a/src/etnaviv/drm/etnaviv_bo_cache.c +++ b/src/etnaviv/drm/etnaviv_bo_cache.c @@ -28,7 +28,6 @@ #include "etnaviv_drmif.h" void _etna_bo_del(struct etna_bo *bo); -extern pthread_mutex_t etna_drm_table_lock; static void add_bucket(struct etna_bo_cache *cache, int size) { diff --git a/src/etnaviv/drm/etnaviv_device.c b/src/etnaviv/drm/etnaviv_device.c index 8d56e9a4f1b..e53fa180e06 100644 --- a/src/etnaviv/drm/etnaviv_device.c +++ b/src/etnaviv/drm/etnaviv_device.c @@ -30,8 +30,6 @@ #include "etnaviv_priv.h" #include "etnaviv_drmif.h" -static pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER; - struct etna_device *etna_device_new(int fd) { struct etna_device *dev = calloc(sizeof(*dev), 1); diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h index 054e6cc730e..bec01ae4ce0 100644 --- a/src/etnaviv/drm/etnaviv_priv.h +++ b/src/etnaviv/drm/etnaviv_priv.h @@ -50,6 +50,8 @@ #include "etnaviv_drmif.h" #include "drm-uapi/etnaviv_drm.h" +extern pthread_mutex_t etna_drm_table_lock; + struct etna_bo_bucket { uint32_t size; struct list_head list; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
