Revert "bhwc2.1: add lock protection when checking BTS capability for layer"

This reverts commit 7635fd167147635d6369b214cb88c2ee8ded3276.

Reason for revert: cause race condition result to composer crash

Bug: 316468278
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8efbc15eeafbe724b34a6cc343df6d6619071650)
Merged-In: I1e3a6ec4267885d628537a3bb510e7e4702286c1
Change-Id: I1e3a6ec4267885d628537a3bb510e7e4702286c1

1 files changed, 9 insertions, 14 deletions

diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
index d4e9458..29ee7ef 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
@@ -1129,23 +1129,18 @@ void ExynosPrimaryDisplay::setDisplayNeedHandleIdleExit(const bool needed, const
 }
 
 void ExynosPrimaryDisplay::handleDisplayIdleEnter(const uint32_t idleTeRefreshRate) {
-    {
-        Mutex::Autolock lock(mDisplayMutex);
-        uint32_t btsRefreshRate = getBtsRefreshRate();
-        if (idleTeRefreshRate <= btsRefreshRate) {
-            return;
-        }
+    Mutex::Autolock lock(mDisplayMutex);
+    uint32_t btsRefreshRate = getBtsRefreshRate();
+    if (idleTeRefreshRate <= btsRefreshRate) {
+        return;
     }
 
     bool needed = false;
-    {
-        Mutex::Autolock lock(mDRMutex);
-        for (size_t i = 0; i < mLayers.size(); i++) {
-            if (mLayers[i]->mOtfMPP && mLayers[i]->mM2mMPP == nullptr &&
-                !mLayers[i]->checkBtsCap(idleTeRefreshRate)) {
-                needed = true;
-                break;
-            }
+    for (size_t i = 0; i < mLayers.size(); i++) {
+        if (mLayers[i]->mOtfMPP && mLayers[i]->mM2mMPP == nullptr &&
+            !mLayers[i]->checkBtsCap(idleTeRefreshRate)) {
+            needed = true;
+            break;
         }
     }