From 023b6b2772422df6c30737f78aa4bdd3d101a84c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 21 Sep 2024 21:41:43 -0500
Subject: [PATCH] Fix DRM FD leak with Vulkan windows

---
 app/streaming/video/ffmpeg-renderers/drm.cpp | 14 ++++++++------
 app/streaming/video/ffmpeg-renderers/drm.h   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/streaming/video/ffmpeg-renderers/drm.cpp b/app/streaming/video/ffmpeg-renderers/drm.cpp
index 9791eea5..ba3e7ac9 100644
--- a/app/streaming/video/ffmpeg-renderers/drm.cpp
+++ b/app/streaming/video/ffmpeg-renderers/drm.cpp
@@ -141,7 +141,7 @@ DrmRenderer::DrmRenderer(AVHWDeviceType hwDeviceType, IFFmpegRenderer *backendRe
       m_HwContext(nullptr),
       m_DrmFd(-1),
       m_DrmIsMaster(false),
-      m_SdlOwnsDrmFd(false),
+      m_MustCloseDrmFd(false),
       m_SupportsDirectRendering(false),
       m_VideoFormat(0),
       m_ConnectorId(0),
@@ -225,7 +225,7 @@ DrmRenderer::~DrmRenderer()
         av_buffer_unref(&m_HwContext);
     }
 
-    if (!m_SdlOwnsDrmFd && m_DrmFd != -1) {
+    if (m_MustCloseDrmFd && m_DrmFd != -1) {
         close(m_DrmFd);
     }
 }
@@ -346,7 +346,7 @@ bool DrmRenderer::initialize(PDECODER_PARAMETERS params)
     m_SwFrameMapper.setVideoFormat(params->videoFormat);
 
     // Try to get the FD that we're sharing with SDL
-    m_DrmFd = StreamUtils::getDrmFdForWindow(m_Window, &m_SdlOwnsDrmFd);
+    m_DrmFd = StreamUtils::getDrmFdForWindow(m_Window, &m_MustCloseDrmFd);
     if (m_DrmFd >= 0) {
         // If we got a DRM FD for the window, we can render to it
         m_DrmIsMaster = true;
@@ -354,17 +354,19 @@ bool DrmRenderer::initialize(PDECODER_PARAMETERS params)
         // If we just opened a new FD, let's drop master on it
         // so SDL can take master for Vulkan rendering. We'll
         // regrab master later if we end up direct rendering.
-        if (!m_SdlOwnsDrmFd) {
+        if (m_MustCloseDrmFd) {
             drmDropMaster(m_DrmFd);
         }
     }
     else {
         // Try to open any DRM render node
         m_DrmFd = StreamUtils::getDrmFd(true);
-
-        // Drop master in case we somehow got a primary node
         if (m_DrmFd >= 0) {
+            // Drop master in case we somehow got a primary node
             drmDropMaster(m_DrmFd);
+
+            // This is a new FD that we must close
+            m_MustCloseDrmFd = true;
         }
     }
 
diff --git a/app/streaming/video/ffmpeg-renderers/drm.h b/app/streaming/video/ffmpeg-renderers/drm.h
index 4ab7b78a..474dc6be 100644
--- a/app/streaming/video/ffmpeg-renderers/drm.h
+++ b/app/streaming/video/ffmpeg-renderers/drm.h
@@ -87,7 +87,7 @@ private:
     AVBufferRef* m_HwContext;
     int m_DrmFd;
     bool m_DrmIsMaster;
-    bool m_SdlOwnsDrmFd;
+    bool m_MustCloseDrmFd;
     bool m_SupportsDirectRendering;
     int m_VideoFormat;
     uint32_t m_ConnectorId;