From aad0c7c6b8e73141f5dd5aed0c091efd5dba5b99 Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Tue, 1 Dec 2020 11:50:22 +0100
Subject: [PATCH] etnaviv/drm: fix evil-twin etna_drm_table_lock

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7832>
---
 src/etnaviv/drm/etnaviv_bo_cache.c | 1 -
 src/etnaviv/drm/etnaviv_device.c   | 2 --
 src/etnaviv/drm/etnaviv_priv.h     | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)

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;