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

Merge "display: create entity_name property" into 24D1-dev am: f115c44f60

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/26714644

Change-Id: Ic028f438c3d66abbfa6ee21e5f5eaf0e31392093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
John Chang 2024-03-27 19:10:34 +00:00 • committed by Automerger Merge Worker
commit add0cb7c4f
2 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device-comet.mk
View file

@ -79,6 +79,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_pres
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
endif endif
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.powerstats.entity_name=Inner-Display
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
vendor.primarydisplay.op.hs_hz=120 \ vendor.primarydisplay.op.hs_hz=120 \
vendor.primarydisplay.op.ns_hz=60 vendor.primarydisplay.op.ns_hz=60

33
powerstats/comet/service.cpp
View file

@ -32,36 +32,12 @@ 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;
void addDisplay(std::shared_ptr<PowerStats> p) { void addOuterDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats for inner display
struct stat primaryBuffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &primaryBuffer)) {
// time_in_state exists
addDisplayMrrByEntity(p, "Inner Display", "/sys/class/drm/card0/device/primary-panel/");
} else {
// time_in_state doesn't exist
std::vector<std::string> inner_states = {
"Off",
"LP: 2152x2076@1",
"LP: 2152x2076@30",
"On: 2152x2076@1",
"On: 2152x2076@10",
"On: 2152x2076@60",
"On: 2152x2076@120",
"HBM: 2152x2076@60",
"HBM: 2152x2076@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Inner Display",
"/sys/class/backlight/panel0-backlight/state",
inner_states));
}
// Add display residency stats for outer display // Add display residency stats for outer display
struct stat secondaryBuffer; struct stat secondaryBuffer;
if (!stat("/sys/class/drm/card0/device/secondary-panel/time_in_state", &secondaryBuffer)) { if (!stat("/sys/class/drm/card0/device/secondary-panel/time_in_state", &secondaryBuffer)) {
// time_in_state exists // time_in_state exists
addDisplayMrrByEntity(p, "Outer Display", "/sys/class/drm/card0/device/secondary-panel/"); addDisplayMrrByEntity(p, "Outer-Display", "/sys/class/drm/card0/device/secondary-panel/");
} else { } else {
// time_in_state doesn't exist // time_in_state doesn't exist
std::vector<std::string> outer_states = { std::vector<std::string> outer_states = {
@ -73,7 +49,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"HBM: 1080x2424@120"}; "HBM: 1080x2424@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>( p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Outer Display", "Outer-Display",
"/sys/class/backlight/panel1-backlight/state", "/sys/class/backlight/panel1-backlight/state",
outer_states)); outer_states));
} }
@ -94,8 +70,9 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Inner-Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addOuterDisplay(p);
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());