From 5c95b36ea852bd211343e56abb6d1e1085c8bd7b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 30 Mar 2022 21:56:08 +0800 Subject: [PATCH 1/5] thermal: provide chg_mdis permission for thermalHAL Bug: 226130317 Test: ls -al dev/thermal/cdev-by-name/chg_mdis/cur_state Change-Id: Id0681d66f33f94baed52f67aea63270a6875ac14 --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index c0923bad..835d13b4 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -923,6 +923,7 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/cdev-by-name/fcc/cur_state chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state + chown system system /dev/thermal/cdev-by-name/chg_mdis/cur_state on property:vendor.disable.bcl.control=1 write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0 From 0f7a0cb1a6bdf120d96d27d52196d5828e77a655 Mon Sep 17 00:00:00 2001 From: Mason Wang Date: Thu, 31 Mar 2022 22:57:40 +0800 Subject: [PATCH 2/5] dumpstate: Dump P10 touch information. Dump the touch information and rawdata when bugreport is triggered. Bug: 199105131 Test: adb bugreport Change-Id: Ie2450a3530ebd615067eaa70f1a0d74985d0e758 --- dumpstate/DumpstateDevice.cpp | 55 +++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 5bf1bcf6..d0b473e1 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -529,8 +529,63 @@ void DumpstateDevice::dumpTouchSection(int fd) { "/proc/fts_ext/driver_test"}; const char lsi_spi_path[] = "/sys/devices/virtual/sec/tsp"; const char syna_cmd_path[] = "/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs"; + const char focaltech_cmd_path[] = "/proc/focaltech_touch"; char cmd[256]; + if (!access(focaltech_cmd_path, R_OK)) { + // Enable: force touch active + snprintf(cmd, sizeof(cmd), "echo 21 > %s/force_active", focaltech_cmd_path); + RunCommandToFd(fd, "Enable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + + // Touch Firmware Version + snprintf(cmd, sizeof(cmd), "%s/FW_Version", focaltech_cmd_path); + DumpFileToFd(fd, "Touch Firmware Version", cmd); + + // Touch INT PIN Test + snprintf(cmd, sizeof(cmd), "%s/INT_PIN", focaltech_cmd_path); + DumpFileToFd(fd, "Touch INT PIN Test", cmd); + + // Get Raw Data - Delta + snprintf(cmd, sizeof(cmd), "%s/selftest/Panel_Differ", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Panel_Differ", cmd); + + // Get Raw Data - Raw + snprintf(cmd, sizeof(cmd), "%s/selftest/Rawdata", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Raw", cmd); + + // Get Raw Data - Baseline + snprintf(cmd, sizeof(cmd), "%s/selftest/Baseline", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Baseline", cmd); + + // Get Raw Data - Noise + snprintf(cmd, sizeof(cmd), "%s/selftest/Noise", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Noise", cmd); + + // Get Raw Data - Uniformity + snprintf(cmd, sizeof(cmd), "%s/selftest/Rawdata_Uniformity", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Uniformity", cmd); + + // Get Scap_CB + snprintf(cmd, sizeof(cmd), "%s/selftest/Scap_CB", focaltech_cmd_path); + DumpFileToFd(fd, "Get Scap_CB", cmd); + + // Get Scap_CB - Raw + snprintf(cmd, sizeof(cmd), "%s/selftest/Scap_Rawdata", focaltech_cmd_path); + DumpFileToFd(fd, "Get Scap_Rawdata", cmd); + + // Get Short Test + snprintf(cmd, sizeof(cmd), "%s/selftest/Short", focaltech_cmd_path); + DumpFileToFd(fd, "Get Short Test", cmd); + + // Get HeatMap(ms,ss) + snprintf(cmd, sizeof(cmd), "%s/selftest/Strength", focaltech_cmd_path); + DumpFileToFd(fd, "Get HeatMap(ms,ss)", cmd); + + // Disable: force touch active + snprintf(cmd, sizeof(cmd), "echo 20 > %s/force_active", focaltech_cmd_path); + RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + } + if (!access(syna_cmd_path, R_OK)) { // Enable: force touch active snprintf(cmd, sizeof(cmd), "echo 21 > %s/force_active", syna_cmd_path); From 5063a9afbf01d3c7e16f9565c2d16d4a68da58a5 Mon Sep 17 00:00:00 2001 From: Stephane Lee Date: Mon, 4 Apr 2022 18:14:09 -0700 Subject: [PATCH 3/5] ODPM: Fix rail selection file permissions Test: Ensure that enabled_rails has system/system permissions Bug: 228112997 Change-Id: I2fc58c7c504f4a18ee2245569258d52dc42da680 --- conf/init.gs201.rc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 55a05629..86626d27 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -860,11 +860,8 @@ on post-fs-data # ODPM on fs - chown system system /sys/devices/platform/acpm_mfd_bus@17500000/i2c-6/6-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/enabled_rails - chown system system /sys/devices/platform/acpm_mfd_bus@17510000/i2c-7/7-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails - - chown system system /sys/devices/platform/acpm_mfd_bus@17500000/i2c-7/7-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/enabled_rails - chown system system /sys/devices/platform/acpm_mfd_bus@17510000/i2c-8/8-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails + chown system system /sys/devices/platform/acpm_mfd_bus@18100000/i2c-7/i2c-s2mpg12mfd/s2mpg12-meter/s2mpg12-odpm/iio\:device0/enabled_rails + chown system system /sys/devices/platform/acpm_mfd_bus@18110000/i2c-8/i2c-s2mpg13mfd/s2mpg13-meter/s2mpg13-odpm/iio\:device1/enabled_rails on property:vendor.thermal.link_ready=1 # BCL From baed6217b0ec83052c3d418bcbb7cb96dba981f1 Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Tue, 5 Apr 2022 20:21:05 +0000 Subject: [PATCH 4/5] Add additional display info to dumpstate Bug: 225376485 Test: Manual - ran 'adb bugreport' Change-Id: I0cffe416805593241c629328973ad005b8c27b08 --- dumpstate/DumpstateDevice.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index d0b473e1..1dc3636a 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -959,13 +959,19 @@ void DumpstateDevice::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"); 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()); + 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"); } // Dump items related to AoC From 14b33156337e8bd526815be91a3caaabdd472375 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Wed, 6 Apr 2022 18:42:05 +0000 Subject: [PATCH 5/5] thermal: Reconfigure GPU DFS clock to divide by 4 Program the GPU Light register to make clock divider to be divided by 4 Bug: 223909471 Test: Local test to verify register value Signed-off-by: Sayanna Chandula Change-Id: If6b3fe9d6cd73cd110e1b6c123b2925c261b5b2a --- conf/init.gs201.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 835d13b4..d45d8467 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -873,7 +873,7 @@ on property:vendor.thermal.link_ready=1 write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c1 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c1 #DFS - write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff04381 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c1 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c3 #OCP