Modify dumpstate to point to decon_counters in sysfs rather than debugfs am: f56de0504d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/21040614

Change-Id: I1f734a99b478bc36956616681618b1ac474009c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Taylor Nelms 2023-02-03 13:47:32 +00:00 committed by Automerger Merge Worker
commit 33e5558e8a

View file

@ -945,15 +945,24 @@ void DumpstateDevice::dumpStorageSection(int fd) {
// Dump items related to display // Dump items related to display
void DumpstateDevice::dumpDisplaySection(int fd) { void DumpstateDevice::dumpDisplaySection(int fd) {
DumpFileToFd(fd, "CRTC-0 underrun count", "/sys/kernel/debug/dri/0/crtc-0/underrun_cnt"); // Dump counters for decon drivers
DumpFileToFd(fd, "CRTC-0 crc count", "/sys/kernel/debug/dri/0/crtc-0/crc_cnt"); const std::string decon_device_sysfs_path("/sys/class/drm/card0/device/");
DumpFileToFd(fd, "CRTC-0 ecc count", "/sys/kernel/debug/dri/0/crtc-0/ecc_cnt"); for(int i = 0; i <= 2; ++i){
DumpFileToFd(fd, "CRTC-0 idma err count", "/sys/kernel/debug/dri/0/crtc-0/idma_err_cnt"); 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-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"); DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"}, RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"},
CommandOptions::WithTimeout(2).Build()); CommandOptions::WithTimeout(2).Build());