From fe0605b2b17a4f01b5b8a5bb310f6c1bb3158b7f Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 7 Mar 2023 11:48:05 +0800 Subject: Move display dump to gs-common Bug: 269212897 Test: adb bugreport Change-Id: I7b17d4d54e90429d07b545e3d53c3f528155dab5 --- dumpstate/Dumpstate.cpp | 44 -------------------------------------------- dumpstate/Dumpstate.h | 1 - 2 files changed, 45 deletions(-) (limited to 'dumpstate') diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 58a2828..96d9bee 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -217,7 +217,6 @@ Dumpstate::Dumpstate() { "memory", [this](int fd) { dumpMemorySection(fd); } }, { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } }, { "power", [this](int fd) { dumpPowerSection(fd); } }, - { "display", [this](int fd) { dumpDisplaySection(fd); } }, { "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } }, }, mLogSections{ @@ -529,49 +528,6 @@ void Dumpstate::dumpMemorySection(int fd) { "done"}); } -// Dump items related to display -void Dumpstate::dumpDisplaySection(int fd) { - // 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 event log", "/sys/kernel/debug/dri/0/crtc-1/event"); - RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"}, - CommandOptions::WithTimeout(2).Build()); - DumpFileToFd(fd, "Primary panel name", "/sys/devices/platform/exynos-drm/primary-panel/panel_name"); - DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); - DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name"); - DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); - if (!PropertiesHelper::IsUserBuild()) { - RunCommandToFd(fd, "HWC Fence States", {"/vendor/bin/sh", "-c", - "for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt); do " - "echo $f ; cat $f ; done"}, - CommandOptions::WithTimeout(2).Build()); - RunCommandToFd(fd, "HWC Error Logs", {"/vendor/bin/sh", "-c", - "for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt); do " - "echo $f ; cat $f ; done"}, - CommandOptions::WithTimeout(2).Build()); - RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c", - "for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do " - "echo $f ; cat $f ; done"}, - CommandOptions::WithTimeout(2).Build()); - } -} - void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) { std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY; diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index a91ef13..98dbeb4 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -56,7 +56,6 @@ class Dumpstate : public BnDumpstateDevice { void dumpPowerSection(int fd); void dumpDevfreqSection(int fd); void dumpMemorySection(int fd); - void dumpDisplaySection(int fd); void dumpPixelTraceSection(int fd); void dumpLogSection(int fd, int fdModem); -- cgit v1.2.3