Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 7639977 from 72215d7306a357fd3b570df648adac2b641fc232 to sc-v2-release

Browse source 
Change-Id: I3b6ea86aa117a869e81eb811b38a63bebdb40d45
This commit is contained in:
Android Build Coastguard Worker 2021-08-14 01:01:32 +00:00
commit 7616af4d61
7 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device-oriole.mk
View file

@ -128,8 +128,9 @@ PRODUCT_SOONG_NAMESPACES += \
# Keyboard bottom padding in dp for portrait mode # Keyboard bottom padding in dp for portrait mode
PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10 PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
# Display LBE # Display
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

2
device-raven.mk
View file

@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \
device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
#config of display brightness dimming #config of display brightness dimming
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=2
# NFC # NFC
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

18
powerstats/oriole/service.cpp
View file

@ -31,6 +31,13 @@ using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
const char kBootRevision[] = "ro.boot.revision";
std::map<std::string, std::string> displayChannelNames = {
{"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.1", "VSYS_PWR_DISPLAY"},
};
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { std::vector<std::string> states = {
@ -45,13 +52,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
std::string rev = android::base::GetProperty(kBootRevision, "");
std::string channelName;
if (displayChannelNames.find(rev) == displayChannelNames.end()) {
channelName = displayChannelNames["EVT1.1"];
} else {
channelName = displayChannelNames[rev];
}
// Add display energy consumer // Add display energy consumer
/* /*
* TODO(b/167216667): Add correct display power model here. Must read from display rail * TODO(b/167216667): Add correct display power model here. Must read from display rail
* and include proper coefficients for display states. * and include proper coefficients for display states.
*/ */
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
{{"LP: 1080x2400@30", 1}, {{"LP: 1080x2400@30", 1},
{"On: 1080x2400@60", 2}, {"On: 1080x2400@60", 2},
{"On: 1080x2400@90", 3}, {"On: 1080x2400@90", 3},

18
powerstats/raven/service.cpp
View file

@ -33,6 +33,13 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
const char kBootRevision[] = "ro.boot.revision";
std::map<std::string, std::string> displayChannelNames = {
{"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.1", "VSYS_PWR_DISPLAY"},
};
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { std::vector<std::string> states = {
@ -51,13 +58,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
std::string rev = android::base::GetProperty(kBootRevision, "");
std::string channelName;
if (displayChannelNames.find(rev) == displayChannelNames.end()) {
channelName = displayChannelNames["EVT1.1"];
} else {
channelName = displayChannelNames[rev];
}
// Add display energy consumer // Add display energy consumer
/* /*
* TODO(b/167216667): Add correct display power model here. Must read from display rail * TODO(b/167216667): Add correct display power model here. Must read from display rail
* and include proper coefficients for display states. * and include proper coefficients for display states.
*/ */
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
{{"LP: 1440x3120@10", 1}, {{"LP: 1440x3120@10", 1},
{"LP: 1440x3120@30", 2}, {"LP: 1440x3120@30", 2},
{"On: 1440x3120@10", 3}, {"On: 1440x3120@10", 3},

10
thermal_info_config_oriole.json
View file

@ -901,7 +901,7 @@
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3] "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
} }
] ]
}, },
@ -1003,13 +1003,7 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",

10
thermal_info_config_oriole_WHI_A.json
View file

@ -574,7 +574,7 @@
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3] "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
} }
] ]
}, },
@ -676,13 +676,7 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",

10
thermal_info_config_raven.json
View file

@ -901,7 +901,7 @@
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3] "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
} }
] ]
}, },
@ -1003,13 +1003,7 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",