Snap for 11373247 from 485b603473
to 24Q2-release
Change-Id: I908170ec3dc7abbbffe631fdafa90c9741640fa5
This commit is contained in:
commit
6a5aba281f
4 changed files with 45 additions and 31 deletions
|
@ -336,7 +336,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=46
|
||||
ro.vendor.build.svn=48
|
||||
|
||||
# DCK properties based on target
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
|
|
|
@ -320,7 +320,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=46
|
||||
ro.vendor.build.svn=48
|
||||
|
||||
# DCK properties based on target
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
|
|
|
@ -36,25 +36,32 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
|||
|
||||
void addDisplay(std::shared_ptr<PowerStats> p) {
|
||||
// Add display residency stats
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1440x3120@30",
|
||||
"On: 1440x3120@10",
|
||||
"On: 1440x3120@60",
|
||||
"On: 1440x3120@120",
|
||||
"HBM: 1440x3120@60",
|
||||
"HBM: 1440x3120@120",
|
||||
"LP: 1080x2340@30",
|
||||
"On: 1080x2340@10",
|
||||
"On: 1080x2340@60",
|
||||
"On: 1080x2340@120",
|
||||
"HBM: 1080x2340@60",
|
||||
"HBM: 1080x2340@120"};
|
||||
struct stat buffer;
|
||||
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
|
||||
// time_in_state exists
|
||||
addDisplayMrr(p);
|
||||
} else {
|
||||
// time_in_state doesn't exist
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1440x3120@30",
|
||||
"On: 1440x3120@10",
|
||||
"On: 1440x3120@60",
|
||||
"On: 1440x3120@120",
|
||||
"HBM: 1440x3120@60",
|
||||
"HBM: 1440x3120@120",
|
||||
"LP: 1080x2340@30",
|
||||
"On: 1080x2340@10",
|
||||
"On: 1080x2340@60",
|
||||
"On: 1080x2340@120",
|
||||
"HBM: 1080x2340@60",
|
||||
"HBM: 1080x2340@120"};
|
||||
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
}
|
||||
|
||||
// Add display energy consumer
|
||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
|
||||
|
|
|
@ -34,18 +34,25 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
|||
|
||||
void addDisplay(std::shared_ptr<PowerStats> p) {
|
||||
// Add display residency stats
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1080x2400@30",
|
||||
"On: 1080x2400@60",
|
||||
"On: 1080x2400@90",
|
||||
"HBM: 1080x2400@60",
|
||||
"HBM: 1080x2400@90"};
|
||||
struct stat buffer;
|
||||
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
|
||||
// time_in_state exists
|
||||
addDisplayMrr(p);
|
||||
} else {
|
||||
// time_in_state doesn't exist
|
||||
std::vector<std::string> states = {
|
||||
"Off",
|
||||
"LP: 1080x2400@30",
|
||||
"On: 1080x2400@60",
|
||||
"On: 1080x2400@90",
|
||||
"HBM: 1080x2400@60",
|
||||
"HBM: 1080x2400@90"};
|
||||
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
}
|
||||
|
||||
// Add display energy consumer
|
||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue