commit 738593c7c5e96b8a16fad8be661710374994e510
author Zachary Reizner <zachr@google.com> Thu Oct 15 18:41:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 15 18:41:58 2015 +0000
tree e653a83cfe883aee1a1593312b3084b07349ba61
parent 6e02c9dac49084e7e94f33e3861e30b46647f914
parent 92f8e6399c0829c6ba6db77d5ea1bbd22f510bb1

Merge "drm_hwcomposer: ground work for squashing" into mnc-dr-dev

nvimporter.cpp

diff --git a/nvimporter.cpp b/nvimporter.cpp
index de3ed55..71b3b7f 100644
--- a/nvimporter.cpp
+++ b/nvimporter.cpp
@@ -157,10 +157,15 @@
 
     gem_close.handle = bo->gem_handles[i];
     int ret = drmIoctl(drm_->fd(), DRM_IOCTL_GEM_CLOSE, &gem_close);
-    if (ret)
+    if (ret) {
       ALOGE("Failed to close gem handle %d %d", i, ret);
-    else
+    } else {
+      /* Clear any duplicate gem handle as well but don't close again */
+      for(int j = i + 1; j < num_gem_handles; j++)
+        if(bo->gem_handles[j] == bo->gem_handles[i])
+          bo->gem_handles[j] = 0;
       bo->gem_handles[i] = 0;
+    }
   }
 }