Merge android14-gs-pixel-5.15-udc-qpr1 into android14-gs-pixel-5.15-24Q1android-u-qpr2-beta-1_r0.7

SBMerger: 558810260
Change-Id: I1c30c0699d808db3534f69cc9be13e980707b099
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

5 files changed, 27 insertions, 8 deletions

diff --git a/display/panel-google-bigsurf.c b/display/panel-google-bigsurf.c
index c5d85b4..bb7f5aa 100644
--- a/display/panel-google-bigsurf.c
+++ b/display/panel-google-bigsurf.c
@@ -581,6 +581,8 @@ static int bigsurf_atomic_check(struct exynos_panel *ctx, struct drm_atomic_stat
 	struct drm_connector_state *new_conn_state =
 					drm_atomic_get_new_connector_state(state, conn);
 	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
+	const struct exynos_panel_mode *pmode;
+	bool was_lp_mode, is_lp_mode;
 
 	bigsurf_update_lhbm_hist_config(ctx);
 
@@ -593,16 +595,19 @@ static int bigsurf_atomic_check(struct exynos_panel *ctx, struct drm_atomic_stat
 	if (!old_crtc_state || !new_crtc_state || !new_crtc_state->active)
 		return 0;
 
-	/* don't skip update when switching from AoD to normal mode */
-	if (ctx->current_mode->exynos_mode.is_lp_mode) {
-		const struct exynos_panel_mode *pmode =
-			exynos_panel_get_mode(ctx, &new_crtc_state->mode);
-		if (pmode && !pmode->exynos_mode.is_lp_mode)
+	was_lp_mode = ctx->current_mode->exynos_mode.is_lp_mode;
+	/* don't skip update when switching between AoD and normal mode */
+	pmode = exynos_panel_get_mode(ctx, &new_crtc_state->mode);
+	if (pmode) {
+		is_lp_mode = pmode->exynos_mode.is_lp_mode;
+		if ((was_lp_mode && !is_lp_mode) || (!was_lp_mode && is_lp_mode))
 			new_crtc_state->color_mgmt_changed = true;
+	} else {
+		dev_err(ctx->dev, "%s: no new mode\n", __func__);
 	}
 
 	if (!drm_atomic_crtc_effectively_active(old_crtc_state) ||
-	    (ctx->current_mode->exynos_mode.is_lp_mode && drm_mode_vrefresh(&new_crtc_state->mode) == 60)) {
+	    (was_lp_mode && drm_mode_vrefresh(&new_crtc_state->mode) == 60)) {
 		struct drm_display_mode *mode = &new_crtc_state->adjusted_mode;
 
 		mode->clock = mode->htotal * mode->vtotal * 120 / 1000;
diff --git a/dts/google/zuma-ripcurrent-battery.dtsi b/dts/google/zuma-ripcurrent-battery.dtsi
index 37db383..acc8e65 100644
--- a/dts/google/zuma-ripcurrent-battery.dtsi
+++ b/dts/google/zuma-ripcurrent-battery.dtsi
@@ -60,6 +60,10 @@
 				google,temp-record-thr = <300 350 400>;
 				google,soc-record-thr = <90 90 95>;
 
+				google,bhi-status-marginal = <79>;
+				google,bhi-status-need-rep = <79>;
+				google,bhi-cycle-grace = <200>;
+
 				#thermal-sensor-cells = <0>;
 				#cooling-cells = <2>;
 				google,dc-irdrop;
diff --git a/dts/google/zuma-shiba-display.dtsi b/dts/google/zuma-shiba-display.dtsi
index fcfd24a..f203d6f 100644
--- a/dts/google/zuma-shiba-display.dtsi
+++ b/dts/google/zuma-shiba-display.dtsi
@@ -13,6 +13,9 @@
 		compatible = "google,bigsurf";
 		label = "google-bigsurf";
 		touch = <&spitouch>;
+		vddd-normal-microvolt = <1150000>;
+		vddd-lp-microvolt     = <1062500>;
+		post-vddd-lp;
 	};
 	google_shoreline: panel@2 {
 		compatible = "google,shoreline";
@@ -25,6 +28,9 @@
 		vci-supply = <&m_ldo14_reg>;
 		vddi-supply = <&s_bucka_reg>;
 		vddd-supply = <&m_ldo22_reg>;
+		vddd-normal-microvolt = <1150000>;
+		vddd-lp-microvolt     = <1062500>;
+		post-vddd-lp;
 	};
 };
 
diff --git a/dts/google/zuma-shusky-battery.dtsi b/dts/google/zuma-shusky-battery.dtsi
index f486447..118b035 100644
--- a/dts/google/zuma-shusky-battery.dtsi
+++ b/dts/google/zuma-shusky-battery.dtsi
@@ -57,6 +57,10 @@
 				google,temp-record-thr = <300 350 400>;
 				google,soc-record-thr = <90 90 95>;
 
+				google,bhi-status-marginal = <79>;
+				google,bhi-status-need-rep = <79>;
+				google,bhi-cycle-grace = <200>;
+
 				#thermal-sensor-cells = <0>;
 				#cooling-cells = <2>;
 				google,dc-irdrop;
diff --git a/dts/google/zuma-shusky-dma-heap.dtsi b/dts/google/zuma-shusky-dma-heap.dtsi
index 0f86261..ad1f016 100644
--- a/dts/google/zuma-shusky-dma-heap.dtsi
+++ b/dts/google/zuma-shusky-dma-heap.dtsi
@@ -7,11 +7,11 @@
  */
 
 &faceauth_tpu {
-	size = <0x00A00000>; /* 10MB */
+	size = <0x00C00000>; /* 12MB */
 };
 
 &farawimg {
-	size = <0x0CE00000>; /* 206MB */
+	size = <0x0CC00000>; /* 204MB */
 };
 
 &faprev {