From 17c28ccd37c56c63a27898b573d7932982e53815 Mon Sep 17 00:00:00 2001 From: Taylor Nelms Date: Mon, 5 Dec 2022 15:22:41 +0000 Subject: [PATCH] Modify dumpstate to point to counters in sysfs rather than debugfs Bug: 240346564 Test: Build for Cheetah device with user build, check bugreport for decon_counters content Merged-In: I0026378d81f5de5ac48b658861a2d8a85c817820 Change-Id: Ia20e1e985d3d83b58e4dce28d7537b49b545e243 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 65f774aa..b85f12dc 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -1059,15 +1059,24 @@ void Dumpstate::dumpStorageSection(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());