From d54cb7e43d34df5b8ca29d827ab3238e9c7fc747 Mon Sep 17 00:00:00 2001
From: Randy Xu <randy.xu@intel.com>
Date: Wed, 5 Apr 2017 11:48:43 +0800
Subject: [PATCH] HWC: Add spinlock for scopedfd

The fence fd will be accessed/udpated by surfaceflinger main and
binder thread, and race condition may cause binder sessin crash

Test: run 3d gles and vulkan app without tearing
JIRA: https://01.org/jira/browse/AIA-332

Signed-off-by: Randy Xu <randy.xu@intel.com>
---
 public/scopedfd.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/scopedfd.h b/public/scopedfd.h
index 5d46f50..9032c1b 100644
--- a/public/scopedfd.h
+++ b/public/scopedfd.h
@@ -18,6 +18,7 @@
 #define PUBLIC_SCOPEDFD_H_
 
 #include <unistd.h>
+#include "spinlock.h"
 
 namespace hwcomposer {
 
@@ -37,27 +38,35 @@ class ScopedFd {
   }
 
   ~ScopedFd() {
+    spin_lock_.lock();
     if (fd_ > 0)
       close(fd_);
+    spin_lock_.unlock();
   }
 
   int Release() {
+    spin_lock_.lock();
     int old_fd = fd_;
     fd_ = -1;
+    spin_lock_.unlock();
     return old_fd;
   }
 
   int Reset(int fd) {
+    spin_lock_.lock();
     if (fd_ > 0)
       close(fd_);
     fd_ = fd;
+    spin_lock_.unlock();
     return fd_;
   }
 
   void Close() {
+    spin_lock_.lock();
     if (fd_ > 0)
       close(fd_);
     fd_ = -1;
+    spin_lock_.unlock();
   }
 
   int get() const {
@@ -65,6 +74,7 @@ class ScopedFd {
   }
 
  private:
+  SpinLock spin_lock_;
   int fd_ = -1;
 };
 
-- 
2.11.0