From b02c634b4d97a8522fc8e61fcbc12df94d44fe7d Mon Sep 17 00:00:00 2001
From: Alcatraz323 <alcatraz32323@gmail.com>
Date: Fri, 3 Mar 2023 15:10:50 +0800
Subject: [PATCH] sdm660-common: power: use more advanced cgroup/task profile &
 drop schedtune powerhint

* schedtune is conflict with uclamp
* CONFIG_CGROUP_FREEZER is enabled
* CONFIG_UCLAMP_TASK is backported and enabled
---
 power-libperfmgr/sdm660_powerhint.json | 15 ---------------
 sdm660.mk                              |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/power-libperfmgr/sdm660_powerhint.json b/power-libperfmgr/sdm660_powerhint.json
index a9553437..8d2343e5 100644
--- a/power-libperfmgr/sdm660_powerhint.json
+++ b/power-libperfmgr/sdm660_powerhint.json
@@ -86,15 +86,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "TASchedtuneBoost",
-      "Path": "/dev/stune/top-app/schedtune.boost",
-      "Values": [
-        "5",
-        "1"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "CPUBWHystTriggerCount",
       "Path": "/sys/class/devfreq/soc:qcom,cpu-cpu-ddr-bw/bw_hwmon/hyst_trigger_count",
@@ -190,12 +181,6 @@
       "Duration": 0,
       "Value": "1113600"
     },
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "TASchedtuneBoost",
-      "Duration": 0,
-      "Value": "5"
-    },
     {
       "PowerHint": "INTERACTION",
       "Node": "CPUBWHystTriggerCount",
diff --git a/sdm660.mk b/sdm660.mk
index f53dfc21..5f08bdf2 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -132,6 +132,11 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.camera.device@1.0 \
     vendor.qti.hardware.camera.device@1.0.vendor
 
+# Control groups and task profiles
+PRODUCT_COPY_FILES += \
+    system/core/libprocessgroup/profiles/cgroups.json:$(TARGET_COPY_OUT_VENDOR)/etc/cgroups.json \
+    system/core/libprocessgroup/profiles/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
+
 # Capability configstore
 PRODUCT_PACKAGES += \
     vendor.qti.hardware.capabilityconfigstore@1.0 \