commit d36dc025a37d813ce6992ed44c35bc331de2dd2d
author David Sodman <dsodman@google.com> Mon Oct 15 11:01:19 2018 -0700
committer David Sodman <dsodman@google.com> Thu Oct 25 10:36:20 2018 -0700
tree 6686a68bc0dc3f3efb1e97124924235a861fbe15
parent e6b2368bdb2d8e640d1d41a139d9530b5d68a650

Revert "SF: Revamp frequencyScale backdoor"

This reverts commit 44b5de0fdfac3f38d356865a9b292f2993058d69.

Test: None
Change-Id: Ica27a149bebfb4aa41f08d63c2b800378e3a35ea

services/surfaceflinger/Scheduler/DispSync.cpp

diff --git a/services/surfaceflinger/Scheduler/DispSync.cpp b/services/surfaceflinger/Scheduler/DispSync.cpp
index cba9181..3f499d9 100644
--- a/services/surfaceflinger/Scheduler/DispSync.cpp
+++ b/services/surfaceflinger/Scheduler/DispSync.cpp
@@ -526,18 +526,16 @@
     mThread->updateModel(mPeriod, mPhase, mReferenceTime);
 }
 
-void DispSync::scalePeriod(HWC2::Device::FrequencyScaler frequencyScaler) {
+void DispSync::scalePeriod(uint32_t multiplier, uint32_t divisor) {
     Mutex::Autolock lock(mMutex);
 
     // if only 1 of the properties is updated, we will get to this
     // point "attempting" to set the scale to 1 when it is already
     // 1.  Check that special case so that we don't do a useless
     // update of the model.
-    if ((frequencyScaler.multiplier == 1) &&
-            (frequencyScaler.divisor == 1) &&
-            (mPeriod == mPeriodBase)) return;
+    if ((multiplier == 1) && (divisor == 1) && (mPeriod == mPeriodBase)) return;
 
-    mPeriod = mPeriodBase * frequencyScaler.multiplier / frequencyScaler.divisor;
+    mPeriod = mPeriodBase * multiplier / divisor;
     mThread->updateModel(mPeriod, mPhase, mReferenceTime);
 }
 

services/surfaceflinger/Scheduler/DispSync.h

diff --git a/services/surfaceflinger/Scheduler/DispSync.h b/services/surfaceflinger/Scheduler/DispSync.h
index 5b511f4..a9640d0 100644
--- a/services/surfaceflinger/Scheduler/DispSync.h
+++ b/services/surfaceflinger/Scheduler/DispSync.h
@@ -24,7 +24,6 @@
 #include <utils/Timers.h>
 
 #include <ui/FenceTime.h>
-#include <DisplayHardware/HWC2.h>
 
 #include <memory>
 
@@ -49,7 +48,7 @@
     virtual bool addResyncSample(nsecs_t timestamp) = 0;
     virtual void endResync() = 0;
     virtual void setPeriod(nsecs_t period) = 0;
-    virtual void scalePeriod(HWC2::Device::FrequencyScaler) = 0;
+    virtual void scalePeriod(const uint32_t multiplier, uint32_t divisor) = 0;
     virtual nsecs_t getPeriod() = 0;
     virtual void setRefreshSkipCount(int count) = 0;
     virtual status_t addEventListener(const char* name, nsecs_t phase, Callback* callback) = 0;
@@ -124,7 +123,7 @@
     // scale the vsync event model's period.   The function is added
     // for an experimental test mode and should not be used outside
     // of that purpose.
-    void scalePeriod(HWC2::Device::FrequencyScaler frequencyScaler);
+    void scalePeriod(const uint32_t multiplier, uint32_t divisor);
 
     // The getPeriod method returns the current vsync period.
     nsecs_t getPeriod() override;