SF: Revamp frequencyScale backdoor
Update the frequencyScale backdoor (1029) to do a primary
display hot unplug-plug so that the updated frequency makes
it to the DisplayManager
Test: adb shell service call SurfaceFlinger 1029 i32 2 i32 3
Change-Id: Id93a5946ee19fbe9925789ba3294cbf213a52c30
diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
index ef31908..a32ff6e 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp
@@ -184,6 +184,7 @@
auto newDisplay = std::make_unique<Display>(
*mComposer.get(), mPowerAdvisor, mCapabilities, displayId, displayType);
+ newDisplay->setFrequencyScaleParameters(mFrequencyScaler);
newDisplay->setConnected(true);
mDisplays.emplace(displayId, std::move(newDisplay));
} else if (connection == Connection::Disconnected) {
@@ -223,6 +224,14 @@
return static_cast<Error>(mComposer->executeCommands());
}
+void Device::setDisplayFrequencyScaleParameters(Device::FrequencyScaler frequencyScaler) {
+ mFrequencyScaler = frequencyScaler;
+}
+
+Device::FrequencyScaler Device::getDisplayFrequencyScaleParameters() {
+ return mFrequencyScaler;
+}
+
// Display methods
Display::Display(android::Hwc2::Composer& composer, android::Hwc2::PowerAdvisor& advisor,
@@ -262,6 +271,7 @@
mWidth(-1),
mHeight(-1),
mVsyncPeriod(-1),
+ mFrequencyScaler(display.mFrequencyScaler),
mDpiX(-1),
mDpiY(-1) {}
@@ -701,6 +711,10 @@
mIsConnected = connected;
}
+void Display::setFrequencyScaleParameters(Device::FrequencyScaler frequencyScaler) {
+ mFrequencyScaler = frequencyScaler;
+}
+
int32_t Display::getAttribute(hwc2_config_t configId, Attribute attribute)
{
int32_t value = 0;
diff --git a/services/surfaceflinger/DisplayHardware/HWC2.h b/services/surfaceflinger/DisplayHardware/HWC2.h
index e0d6ecc..a8f24d6 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.h
+++ b/services/surfaceflinger/DisplayHardware/HWC2.h
@@ -85,6 +85,11 @@
public:
explicit Device(std::unique_ptr<android::Hwc2::Composer> composer);
+ struct FrequencyScaler {
+ int32_t multiplier = 1;
+ int32_t divisor = 1;
+ };
+
void registerCallback(ComposerCallback* callback, int32_t sequenceId);
// Required by HWC2
@@ -116,6 +121,9 @@
// This method provides an explicit way to flush state changes to HWC.
Error flushCommands();
+ void setDisplayFrequencyScaleParameters(FrequencyScaler frequecyScaler);
+ FrequencyScaler getDisplayFrequencyScaleParameters();
+
private:
// Initialization methods
@@ -126,6 +134,7 @@
std::unordered_set<Capability> mCapabilities;
std::unordered_map<hwc2_display_t, std::unique_ptr<Display>> mDisplays;
android::Hwc2::impl::PowerAdvisor mPowerAdvisor;
+ FrequencyScaler mFrequencyScaler;
bool mRegisteredCallback = false;
};
@@ -161,8 +170,6 @@
}
Builder& setVsyncPeriod(int32_t vsyncPeriod) {
mConfig->mVsyncPeriod = vsyncPeriod;
- mConfig->mPeriodMultiplier = 1;
- mConfig->mPeriodDivisor = 1;
return *this;
}
Builder& setDpiX(int32_t dpiX) {
@@ -193,11 +200,7 @@
int32_t getWidth() const { return mWidth; }
int32_t getHeight() const { return mHeight; }
nsecs_t getVsyncPeriod() const {
- return mVsyncPeriod * mPeriodMultiplier / mPeriodDivisor; }
- void scalePanelFrequency(int32_t multiplier, int32_t divisor) const {
- mPeriodMultiplier = multiplier;
- mPeriodDivisor = divisor;
- }
+ return mVsyncPeriod * mFrequencyScaler.multiplier / mFrequencyScaler.divisor; }
float getDpiX() const { return mDpiX; }
float getDpiY() const { return mDpiY; }
@@ -210,8 +213,7 @@
int32_t mWidth;
int32_t mHeight;
nsecs_t mVsyncPeriod;
- mutable int32_t mPeriodMultiplier;
- mutable int32_t mPeriodDivisor;
+ Device::FrequencyScaler mFrequencyScaler;
float mDpiX;
float mDpiY;
};
@@ -279,6 +281,7 @@
hwc2_display_t getId() const { return mId; }
bool isConnected() const { return mIsConnected; }
void setConnected(bool connected); // For use by Device only
+ void setFrequencyScaleParameters(Device::FrequencyScaler frequencyScaler);
private:
int32_t getAttribute(hwc2_config_t configId, Attribute attribute);
@@ -303,6 +306,7 @@
hwc2_display_t mId;
bool mIsConnected;
DisplayType mType;
+ Device::FrequencyScaler mFrequencyScaler;
std::unordered_map<hwc2_layer_t, std::unique_ptr<Layer>> mLayers;
std::unordered_map<hwc2_config_t, std::shared_ptr<const Config>> mConfigs;
};
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index bf8905a..630cc0b 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -807,4 +807,15 @@
return mDisplayData[displayId].hwcDisplay->getId();
}
+void HWComposer::setDisplayFrequencyScaleParameters(
+ HWC2::Device::FrequencyScaler frequencyScaler)
+{
+ mHwcDevice->setDisplayFrequencyScaleParameters(frequencyScaler);
+}
+
+HWC2::Device::FrequencyScaler HWComposer::getDisplayFrequencyScaleParameters()
+{
+ return mHwcDevice->getDisplayFrequencyScaleParameters();
+}
+
} // namespace android
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index 3c5efea..9e01626 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -184,6 +184,14 @@
android::Hwc2::Composer* getComposer() const { return mHwcDevice->getComposer(); }
std::optional<hwc2_display_t> getHwcDisplayId(int32_t displayId) const;
+
+ // ------------------------------------------------------------------------
+ // These functions set and get the frequencyScaler. The frequencyScaler holds
+ // a multiplier and divisor for virtually scaling the panel frequency in
+ // software. This is used to simulate different panel frequencies when
+ // panel hardware is not available.
+ void setDisplayFrequencyScaleParameters(HWC2::Device::FrequencyScaler frequencyScaler);
+ HWC2::Device::FrequencyScaler getDisplayFrequencyScaleParameters();
private:
// For unit tests
friend TestableSurfaceFlinger;