Modify dumpstate to point to counters in sysfs rather than debugfs

Bug: 240346564
Test: Build for P23 device with "user" build, check bugreport for decon_counters content
Change-Id: Icb002977d46a50902a426a11305ab4a2a86dfc98
Signed-off-by: Taylor Nelms <tknelms@google.com>
This commit is contained in:
Taylor Nelms 2022-12-09 15:35:14 +00:00
parent 490ca451ed
commit 16a03fb864

View file

@ -543,15 +543,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());