From e97910bdff69f24d216af474ca13652649363c6e Mon Sep 17 00:00:00 2001
From: Demon Singur <demonsingur@gmail.com>
Date: Thu, 18 Oct 2018 17:03:12 +0000
Subject: [PATCH] sdm660-common: power-libperfmgr: remove VR hints handling

Change-Id: I4da9b175c3df713f5befd9364ff75b5c1b41a48d
Signed-off-by: Subhajeet Muhuri <subhajeet.muhuri@gmail.com>
---
 power-libperfmgr/hidl/Power.cpp | 50 ++++-----------------------------
 power-libperfmgr/hidl/Power.h   |  1 -
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/power-libperfmgr/hidl/Power.cpp b/power-libperfmgr/hidl/Power.cpp
index 556fafd5..9c3e8906 100644
--- a/power-libperfmgr/hidl/Power.cpp
+++ b/power-libperfmgr/hidl/Power.cpp
@@ -51,7 +51,6 @@ constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json";
 Power::Power()
     : mHintManager(nullptr),
       mInteractionHandler(nullptr),
-      mVRModeOn(false),
       mSustainedPerfModeOn(false),
       mCameraStreamingMode(false),
       mReady(false) {
@@ -72,15 +71,6 @@ Power::Power()
             ALOGI("Initialize with SUSTAINED_PERFORMANCE on");
             mHintManager->DoHint("SUSTAINED_PERFORMANCE");
             mSustainedPerfModeOn = true;
-        } else if (state == "VR_MODE") {
-            ALOGI("Initialize with VR_MODE on");
-            mHintManager->DoHint("VR_MODE");
-            mVRModeOn = true;
-        } else if (state == "VR_SUSTAINED_PERFORMANCE") {
-            ALOGI("Initialize with SUSTAINED_PERFORMANCE and VR_MODE on");
-            mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE");
-            mSustainedPerfModeOn = true;
-            mVRModeOn = true;
         } else {
             ALOGI("Initialize PowerHAL");
         }
@@ -117,7 +107,7 @@ Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) {
              android::hardware::power::V1_0::toString(hint).c_str(), static_cast<int>(data));
     switch (hint) {
         case PowerHint_1_0::INTERACTION:
-            if (mVRModeOn || mSustainedPerfModeOn) {
+            if (mSustainedPerfModeOn) {
                 ALOGV("%s: ignoring due to other active perf hints", __func__);
             } else {
                 mInteractionHandler->Acquire(data);
@@ -125,42 +115,15 @@ Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) {
             break;
         case PowerHint_1_0::SUSTAINED_PERFORMANCE:
             if (data && !mSustainedPerfModeOn) {
-                if (!mVRModeOn) {  // Sustained mode only.
-                    mHintManager->DoHint("SUSTAINED_PERFORMANCE");
-                } else {  // Sustained + VR mode.
-                    mHintManager->EndHint("VR_MODE");
-                    mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE");
-                }
+                mHintManager->DoHint("SUSTAINED_PERFORMANCE");
                 mSustainedPerfModeOn = true;
             } else if (!data && mSustainedPerfModeOn) {
-                mHintManager->EndHint("VR_SUSTAINED_PERFORMANCE");
                 mHintManager->EndHint("SUSTAINED_PERFORMANCE");
-                if (mVRModeOn) {  // Switch back to VR Mode.
-                    mHintManager->DoHint("VR_MODE");
-                }
                 mSustainedPerfModeOn = false;
             }
             break;
-        case PowerHint_1_0::VR_MODE:
-            if (data && !mVRModeOn) {
-                if (!mSustainedPerfModeOn) {  // VR mode only.
-                    mHintManager->DoHint("VR_MODE");
-                } else {  // Sustained + VR mode.
-                    mHintManager->EndHint("SUSTAINED_PERFORMANCE");
-                    mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE");
-                }
-                mVRModeOn = true;
-            } else if (!data && mVRModeOn) {
-                mHintManager->EndHint("VR_SUSTAINED_PERFORMANCE");
-                mHintManager->EndHint("VR_MODE");
-                if (mSustainedPerfModeOn) {  // Switch back to sustained Mode.
-                    mHintManager->DoHint("SUSTAINED_PERFORMANCE");
-                }
-                mVRModeOn = false;
-            }
-            break;
         case PowerHint_1_0::LAUNCH:
-            if (mVRModeOn || mSustainedPerfModeOn) {
+            if (mSustainedPerfModeOn) {
                 ALOGV("%s: ignoring due to other active perf hints", __func__);
             } else {
                 if (data) {
@@ -222,7 +185,7 @@ Return<void> Power::powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) {
             }
             break;
         case PowerHint_1_2::AUDIO_STREAMING:
-            if (mVRModeOn || mSustainedPerfModeOn) {
+            if (mSustainedPerfModeOn) {
                 ALOGV("%s: ignoring due to other active perf hints", __func__);
             } else {
                 if (data) {
@@ -281,7 +244,7 @@ Return<void> Power::powerHintAsync_1_3(PowerHint_1_3 hint, int32_t data) {
 
     if (hint == PowerHint_1_3::EXPENSIVE_RENDERING) {
         ATRACE_INT(android::hardware::power::V1_3::toString(hint).c_str(), data);
-        if (mVRModeOn || mSustainedPerfModeOn) {
+        if (mSustainedPerfModeOn) {
             ALOGV("%s: ignoring due to other active perf hints", __func__);
         } else {
             if (data > 0) {
@@ -306,10 +269,9 @@ Return<void> Power::debug(const hidl_handle &handle, const hidl_vec<hidl_string>
 
         std::string buf(android::base::StringPrintf(
                 "HintManager Running: %s\n"
-                "VRMode: %s\n"
                 "CameraStreamingMode: %s\n"
                 "SustainedPerformanceMode: %s\n",
-                boolToString(mHintManager->IsRunning()), boolToString(mVRModeOn),
+                boolToString(mHintManager->IsRunning()),
                 boolToString(mCameraStreamingMode),
                 boolToString(mSustainedPerfModeOn)));
         // Dump nodes through libperfmgr
diff --git a/power-libperfmgr/hidl/Power.h b/power-libperfmgr/hidl/Power.h
index de16e083..2e25d89c 100644
--- a/power-libperfmgr/hidl/Power.h
+++ b/power-libperfmgr/hidl/Power.h
@@ -71,7 +71,6 @@ class Power : public IPower {
   private:
     std::shared_ptr<HintManager> mHintManager;
     std::unique_ptr<InteractionHandler> mInteractionHandler;
-    std::atomic<bool> mVRModeOn;
     std::atomic<bool> mSustainedPerfModeOn;
     std::atomic<bool> mCameraStreamingMode;
     std::atomic<bool> mReady;