From c50d6678f6c73608ced5072e67b2aa3f52750811 Mon Sep 17 00:00:00 2001 From: Taylor Nelms Date: Mon, 5 Dec 2022 16:33:46 +0000 Subject: [PATCH 1/2] Modify dumpstate to point to decon_counters in sysfs rather than debugfs Bug: 240346564 Test: Build for Oriole device with "user" build, check bug report for decon_counters content Change-Id: I5ae08064c2c4106b9f54f7823f1e325a6d6978b5 Signed-off-by: Taylor Nelms --- dumpstate/Dumpstate.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index a4a6316d..a4fcfeae 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -554,15 +554,24 @@ void Dumpstate::dumpMemorySection(int fd) { // Dump items related to display void Dumpstate::dumpDisplaySection(int fd) { - DumpFileToFd(fd, "CRTC-0 underrun count", "/sys/kernel/debug/dri/0/crtc-0/underrun_cnt"); - DumpFileToFd(fd, "CRTC-0 crc count", "/sys/kernel/debug/dri/0/crtc-0/crc_cnt"); - DumpFileToFd(fd, "CRTC-0 ecc count", "/sys/kernel/debug/dri/0/crtc-0/ecc_cnt"); - DumpFileToFd(fd, "CRTC-0 idma err count", "/sys/kernel/debug/dri/0/crtc-0/idma_err_cnt"); + // Dump counters for decon drivers + const std::string decon_device_sysfs_path("/sys/class/drm/card0/device/"); + for(int i = 0; i <= 2; ++i){ + const std::string decon_num_str = std::to_string(i); + const std::string decon_counter_path = decon_device_sysfs_path + + "decon" + decon_num_str + + "/counters"; + if (access(decon_counter_path.c_str(), R_OK) == 0){ + DumpFileToFd(fd, "DECON-" + decon_num_str + " counters", + decon_counter_path); + } + else{ + ::android::base::WriteStringToFd("No counters for DECON-" + + decon_num_str + " found at path (" + decon_counter_path + ")\n", + fd); + } + } DumpFileToFd(fd, "CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event"); - DumpFileToFd(fd, "CRTC-1 underrun count", "/sys/kernel/debug/dri/0/crtc-1/underrun_cnt"); - DumpFileToFd(fd, "CRTC-1 crc count", "/sys/kernel/debug/dri/0/crtc-1/crc_cnt"); - DumpFileToFd(fd, "CRTC-1 ecc count", "/sys/kernel/debug/dri/0/crtc-1/ecc_cnt"); - DumpFileToFd(fd, "CRTC-1 idma err count", "/sys/kernel/debug/dri/0/crtc-1/idma_err_cnt"); DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event"); RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"}, CommandOptions::WithTimeout(2).Build()); From 8af69a8c18728107ff19ef6b939c704f24843905 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Wed, 7 Dec 2022 05:19:12 +0000 Subject: [PATCH 2/2] WLC: Move the wireless_charger to gs-common Bug: 237600973 Change-Id: I442942c1389283d6341fa53cc5529e86b1d84df0 Signed-off-by: Ken Yang --- device_framework_matrix_product_wireless.xml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 device_framework_matrix_product_wireless.xml diff --git a/device_framework_matrix_product_wireless.xml b/device_framework_matrix_product_wireless.xml deleted file mode 100644 index 8b27097c..00000000 --- a/device_framework_matrix_product_wireless.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - vendor.google.wireless_charger - 1.3 - - IWirelessCharger - default - - -