commit 958b72af89333c142c16c8f7a7b35af0b10ec60f
author Ramkumar Radhakrishnan <ramkumar@codeaurora.org> Mon May 18 19:37:13 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 26 16:55:10 2015 -0700
tree f35db286742cd414b70b2d860ba3f6007c75191f
parent 44aaba5765c785c2486d6ab75ef83c470677d184

sdm: Fix fence fd leak and invalid error handling for rotator.

- Fix fence fd leak on dual rotation mode.
- Do not return error on rotator creation failure.

Change-Id: Ia055ee74d39b77d285729381ea3da197d1c47f96

sdm/libs/core/core_impl.cpp

diff --git a/sdm/libs/core/core_impl.cpp b/sdm/libs/core/core_impl.cpp
index d9c8500..d253b2e 100644
--- a/sdm/libs/core/core_impl.cpp
+++ b/sdm/libs/core/core_impl.cpp
@@ -99,8 +99,7 @@
     error = extension_intf_->CreateRotator(buffer_allocator_, buffer_sync_handler_,
                                            &rotator_intf_);
     if (error != kErrorNone) {
-      comp_mgr_.Deinit();
-      goto CleanupOnError;
+      DLOGW("rotation is not supported");
     }
   }
 

sdm/libs/core/fb/hw_device.cpp

diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp
index 4c6e5a5..54b00ff 100644
--- a/sdm/libs/core/fb/hw_device.cpp
+++ b/sdm/libs/core/fb/hw_device.cpp
@@ -442,23 +442,14 @@
     uint32_t layer_index = hw_layer_info.index[i];
     LayerBuffer *input_buffer = stack->layers[layer_index].input_buffer;
     HWRotatorSession *hw_rotator_session = &hw_layers->config[i].hw_rotator_session;
-    HWRotateInfo *left_rotate = &hw_rotator_session->hw_rotate_info[0];
-    HWRotateInfo *right_rotate = &hw_rotator_session->hw_rotate_info[1];
 
-    if (!left_rotate->valid && !right_rotate->valid) {
-      input_buffer->release_fence_fd = dup(mdp_commit.release_fence);
-      continue;
+    if (hw_rotator_session->hw_block_count) {
+      input_buffer = &hw_rotator_session->output_buffer;
+      close_(input_buffer->acquire_fence_fd);
+      input_buffer->acquire_fence_fd = -1;
     }
 
-    for (uint32_t count = 0; count < 2; count++) {
-      HWRotateInfo *hw_rotate_info = &hw_rotator_session->hw_rotate_info[count];
-      if (hw_rotate_info->valid) {
-        input_buffer = &hw_rotator_session->output_buffer;
-        input_buffer->release_fence_fd = dup(mdp_commit.release_fence);
-        close_(input_buffer->acquire_fence_fd);
-        input_buffer->acquire_fence_fd = -1;
-      }
-    }
+    input_buffer->release_fence_fd = dup(mdp_commit.release_fence);
   }
   DLOGI_IF(kTagDriverConfig, "*************************** %s Commit Input ************************",
            device_name_);