summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-11-12 18:49:03 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-11-12 18:49:03 -0800
commitb97bc45cc2cf7c6b854a8220e1fa211f52155d2a (patch)
tree767ad9331cb98f50ae2092ebf16f108ee7756909
parentdf051023c27c007cb0af9bbe7b7b41954dc9e1c8 (diff)
parent32674f497b117d96ca7adf39ce0ec5697746903a (diff)
downloadshusky-b97bc45cc2cf7c6b854a8220e1fa211f52155d2a.tar.gz
Merge android14-gs-pixel-5.15-udc-qpr1 into android14-gs-pixel-5.15-udc-d2
SBMerger: 571992243 Change-Id: I0a63877da96fcb14f78e3d961d1ac3843be42041 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--display/panel-google-bigsurf.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/display/panel-google-bigsurf.c b/display/panel-google-bigsurf.c
index bb7f5aa..1aa3808 100644
--- a/display/panel-google-bigsurf.c
+++ b/display/panel-google-bigsurf.c
@@ -743,7 +743,14 @@ static int bigsurf_set_brightness(struct exynos_panel *ctx, u16 br)
low_to_high ? 0x00 : 0xAA,
0x00);
}
- EXYNOS_DCS_BUF_ADD_AND_FLUSH(ctx, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, br >> 8, br & 0xff);
+ if (IS_HBM_ON_IRC_OFF(ctx->hbm_mode) && ctx->panel_rev >= PANEL_REV_EVT1 &&
+ br == ctx->desc->brt_capability->hbm.level.max) {
+ EXYNOS_DCS_BUF_ADD_AND_FLUSH(ctx, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, 0x0F, 0xFF);
+ dev_dbg(ctx->dev, " apply max DBV when reach hbm max with irc off\n");
+ } else {
+ EXYNOS_DCS_BUF_ADD_AND_FLUSH(ctx, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, br >> 8,
+ br & 0xff);
+ }
spanel->panel_brightness = br;
return 0;
}