From b8248d3ec47c891ef26bf0acd9d0121fcd816c59 Mon Sep 17 00:00:00 2001
From: Taylor Nelms <tknelms@google.com>
Date: Mon, 5 Dec 2022 15:22:41 +0000
Subject: [PATCH 1/2] 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
Change-Id: I0026378d81f5de5ac48b658861a2d8a85c817820
Signed-off-by: Taylor Nelms <tknelms@google.com>
---
 dumpstate/Dumpstate.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 34cf23f1..42bdb2ee 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -552,15 +552,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 66f39332a98b4c59676440ff67a961a528b751bd Mon Sep 17 00:00:00 2001
From: Ken Yang <yangken@google.com>
Date: Sun, 7 Aug 2022 15:45:34 +0000
Subject: [PATCH 2/2] WLC: Move the wireless_charger to gs-common

Bug: 237600973
Change-Id: Ia87d71b3c3a5e3700c8484b89e6b6fdafa01c42c
Signed-off-by: Ken Yang <yangken@google.com>
---
 device_framework_matrix_product.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index fc00f31b..03987cf8 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -159,14 +159,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.google.wireless_charger</name>
-        <version>1.3</version>
-        <interface>
-            <name>IWirelessCharger</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung_slsi.telephony.hardware.oemservice</name>
         <version>1.0</version>