Merge changes from topic "tm-adpf-1st-frame-boost-gpu" into tm-qpr-dev

* changes:
  ADPF: send ADPF_FIRST_FRAME hint
  ADPF: support sending power hint

2 files changed, 16 insertions, 0 deletions

diff --git a/power-libperfmgr/aidl/PowerHintSession.cpp b/power-libperfmgr/aidl/PowerHintSession.cpp
index 14cbf01..5de37ba 100644
--- a/power-libperfmgr/aidl/PowerHintSession.cpp
+++ b/power-libperfmgr/aidl/PowerHintSession.cpp
@@ -191,6 +191,15 @@ void PowerHintSession::updateUniveralBoostMode() {
     }
 }
 
+void PowerHintSession::tryToSendPowerHint(std::string hint) {
+    if (!mSupportedHints[hint].has_value()) {
+        mSupportedHints[hint] = HintManager::GetInstance()->IsHintSupported(hint);
+    }
+    if (mSupportedHints[hint].value()) {
+        HintManager::GetInstance()->DoHint(hint);
+    }
+}
+
 int PowerHintSession::setSessionUclampMin(int32_t min) {
     {
         std::lock_guard<std::mutex> guard(mSessionLock);
@@ -334,6 +343,9 @@ ndk::ScopedAStatus PowerHintSession::reportActualWorkDuration(
 
     mLastUpdatedTime.store(std::chrono::steady_clock::now());
     if (isFirstFrame) {
+        if (isAppSession()) {
+            tryToSendPowerHint("ADPF_FIRST_FRAME");
+        }
         updateUniveralBoostMode();
     }
 
diff --git a/power-libperfmgr/aidl/PowerHintSession.h b/power-libperfmgr/aidl/PowerHintSession.h
index 9bd9a2c..604f6e2 100644
--- a/power-libperfmgr/aidl/PowerHintSession.h
+++ b/power-libperfmgr/aidl/PowerHintSession.h
@@ -132,6 +132,7 @@ class PowerHintSession : public BnPowerHintSession {
   private:
     void updateUniveralBoostMode();
     int setSessionUclampMin(int32_t min);
+    void tryToSendPowerHint(std::string hint);
     std::string getIdString() const;
     const std::shared_ptr<AdaptiveCpu> mAdaptiveCpu;
     AppHintDesc *mDescriptor = nullptr;
@@ -145,6 +146,9 @@ class PowerHintSession : public BnPowerHintSession {
     int64_t mLastStartedTimeNs;
     int64_t mLastDurationNs;
     int64_t mWorkPeriodNs;
+
+    // To cache the status of whether ADPF hints are supported.
+    std::unordered_map<std::string, std::optional<bool>> mSupportedHints;
 };
 
 }  // namespace pixel