From 0757f2676b30ab399e7d39437585843dc28e9ab4 Mon Sep 17 00:00:00 2001
From: "Pierre-Loup A. Griffais" <git@plagman.net>
Date: Fri, 24 Jul 2020 15:01:31 -0700
Subject: [PATCH] Revert "Copy commit queue in check_new_wayland_res"

This reverts commit 9c9a8093ee59eb955c36e10597efd18842865726.
---
 src/steamcompmgr.cpp | 114 +++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index 4f2f97c..23b59c9 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -2074,67 +2074,73 @@ void handle_done_commits( void )
 
 void check_new_wayland_res( void )
 {
-	// When importing buffer, we'll potentially need to perform operations with
-	// a wlserver lock (e.g. wlr_buffer_lock). We can't do this with a
-	// wayland_commit_queue lock because that causes deadlocks.
-	std::vector<ResListEntry_t> tmp_queue;
+	// We need to release buffers without having a commit queue lock, otherwise
+	// we won't be able to lock wlserver without a deadlock
+	std::vector<struct wlr_buffer *> release_queue;
+
 	{
 		std::lock_guard<std::mutex> lock( wayland_commit_lock );
-		tmp_queue = wayland_commit_queue;
+
+		for ( uint32_t i = 0; i < wayland_commit_queue.size(); i++ )
+		{
+			struct wlr_buffer *buf = wayland_commit_queue[ i ].buf;
+
+			win	*w = find_win( wayland_commit_queue[ i ].surf );
+
+			if ( w == nullptr )
+			{
+				release_queue.push_back( buf );
+				fprintf (stderr, "waylandres but no win\n");
+				continue;
+			}
+
+			struct wlr_dmabuf_attributes dmabuf = {};
+			bool result = False;
+			if ( wlr_buffer_get_dmabuf( buf, &dmabuf ) ) {
+				result = true;
+				for ( int i = 0; i < dmabuf.n_planes; i++ ) {
+					dmabuf.fd[i] = dup( dmabuf.fd[i] );
+					assert( dmabuf.fd[i] >= 0 );
+				}
+			} else {
+				struct wlr_client_buffer *client_buf = (struct wlr_client_buffer *) buf;
+				result = wlr_texture_to_dmabuf( client_buf->texture, &dmabuf );
+			}
+			assert( result == true );
+
+			commit_t newCommit = {};
+			bool bSuccess = import_commit( buf, &dmabuf, newCommit );
+			wlr_dmabuf_attributes_finish( &dmabuf );
+
+			if ( bSuccess == true )
+			{
+				newCommit.commitID = ++maxCommmitID;
+				w->commit_queue.push_back( newCommit );
+			}
+
+			uint32_t fence = vulkan_get_texture_fence( newCommit.vulkanTex );
+
+			gpuvis_trace_printf( "pushing wait for commit %lu\n", newCommit.commitID );
+			{
+				std::unique_lock< std::mutex > lock( waitListLock );
+
+				waitList.push_back( std::make_pair( fence, newCommit.commitID ) );
+			}
+
+			// Wake up commit wait thread if chilling
+			waitListSem.signal();
+		}
+
 		wayland_commit_queue.clear();
 	}
 
-	for ( uint32_t i = 0; i < tmp_queue.size(); i++ )
+	wlserver_lock();
+	for ( uint32_t i = 0; i < release_queue.size(); i++ )
 	{
-		struct wlr_buffer *buf = tmp_queue[ i ].buf;
-
-		win	*w = find_win( tmp_queue[ i ].surf );
-
-		if ( w == nullptr )
-		{
-			wlserver_lock();
-			wlr_buffer_unlock( buf );
-			wlserver_unlock();
-			fprintf (stderr, "waylandres but no win\n");
-			continue;
-		}
-
-		struct wlr_dmabuf_attributes dmabuf = {};
-		bool result = False;
-		if ( wlr_buffer_get_dmabuf( buf, &dmabuf ) ) {
-			result = true;
-			for ( int i = 0; i < dmabuf.n_planes; i++ ) {
-				dmabuf.fd[i] = dup( dmabuf.fd[i] );
-				assert( dmabuf.fd[i] >= 0 );
-			}
-		} else {
-			struct wlr_client_buffer *client_buf = (struct wlr_client_buffer *) buf;
-			result = wlr_texture_to_dmabuf( client_buf->texture, &dmabuf );
-		}
-		assert( result == true );
-
-		commit_t newCommit = {};
-		bool bSuccess = import_commit( buf, &dmabuf, newCommit );
-		wlr_dmabuf_attributes_finish( &dmabuf );
-
-		if ( bSuccess == true )
-		{
-			newCommit.commitID = ++maxCommmitID;
-			w->commit_queue.push_back( newCommit );
-		}
-
-		uint32_t fence = vulkan_get_texture_fence( newCommit.vulkanTex );
-
-		gpuvis_trace_printf( "pushing wait for commit %lu\n", newCommit.commitID );
-		{
-			std::unique_lock< std::mutex > lock( waitListLock );
-
-			waitList.push_back( std::make_pair( fence, newCommit.commitID ) );
-		}
-
-		// Wake up commit wait thread if chilling
-		waitListSem.signal();
+		wlr_buffer_unlock( release_queue[ i ] );
 	}
+	wlserver_unlock();
+	release_queue.clear();
 }
 
 int