From d337a06e1b31948321714af7ea09c51bd30ca456 Mon Sep 17 00:00:00 2001
From: George Lee <geolee@google.com>
Date: Mon, 16 Aug 2021 10:01:55 -0700
Subject: [PATCH 1/2] bcl: Put OCP_WARN back to original level

Bug: 196833426
Test: Boot and confirm proper level set
Signed-off-by: George Lee <geolee@google.com>
Change-Id: Iff9e77c39de546c53fd2404d3a0e15408b0e856d
---
 thermal_info_config_oriole.json       | 16 +++++-----------
 thermal_info_config_oriole_WHI_A.json | 16 +++++-----------
 thermal_info_config_raven.json        | 18 ++++++------------
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 5c3e7c9..8f79c35 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -882,7 +882,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -897,13 +897,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -913,7 +907,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -988,7 +982,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -1013,7 +1007,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index c60da21..fa7398d 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -555,7 +555,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -570,13 +570,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -586,7 +580,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -661,7 +655,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -686,7 +680,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 3050df4..fc23f6a 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -882,7 +882,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -897,13 +897,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -913,7 +907,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -938,7 +932,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -988,7 +982,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -1013,7 +1007,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],

From 0e8a67f822ddb742fd457202c662a7864c10d3ca Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Wed, 18 Aug 2021 11:02:49 +0800
Subject: [PATCH 2/2] oriole: enable media performance class 12

Bug: 196768374
Test: atest CtsMediaPerformanceClassTestCases
Test: atest android.hardware.camera2.cts.ExtendedCameraCharacteristicsTest
Test: atest android.filesystem.cts.RandomRWTest
Test: atest android.filesystem.cts.SequentialRWTest
Test: atest CtsVideoQualityFloorHostTestCases
Change-Id: I9eaa78c23b6e9645ea5a344b9da0de3cacf21e17
---
 device-oriole.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device-oriole.mk b/device-oriole.mk
index 622fd4d..c8c6d8f 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -132,6 +132,9 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
 
+# Media Performance Class 12
+PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \