Snap for 12922552 from 2522986dc5147c9b41a196b9583cbdc067cbf7ea to android14-gs-pixel-6.1-trunk-release
Change-Id: I805a94c0dee8e13767984b61baa60d9f2786c72a
Signed-off-by: Coastguard Worker <[email protected]>
diff --git a/display/panel-gs-ct3d.c b/display/panel-gs-ct3d.c
index 581ee30..fe71c42 100644
--- a/display/panel-gs-ct3d.c
+++ b/display/panel-gs-ct3d.c
@@ -25,8 +25,6 @@
#define CT3D_DDIC_ID_LEN 8
#define CT3D_DIMMING_FRAME 32
-#define CT3D_BEH_LEN 10
-#define CT3D_READ_BEH_RETRY_COUNT 3
#define WIDTH_MM 64
#define HEIGHT_MM 145
@@ -219,7 +217,7 @@
GS_DSI_CMD(0x91, 0x89, 0xA8, 0x00, 0x18, 0xD2, 0x00, 0x02, 0x25, 0x02,
0x35, 0x00, 0x07, 0x04, 0x86, 0x04, 0x3D, 0x10, 0xF0),
GS_DSI_CMD(0x2F, 0x02),
- GS_DSI_DELAY_CMD(70, MIPI_DCS_EXIT_SLEEP_MODE)
+ GS_DSI_DELAY_CMD(60, MIPI_DCS_EXIT_SLEEP_MODE)
};
static DEFINE_GS_CMDSET(ct3d_init);
@@ -409,28 +407,6 @@
GS_DCS_BUF_ADD_CMD_AND_FLUSH(dev, 0xB2, dimming_frame, dimming_frame);
}
-static int ct3d_read_beh(struct gs_panel *ctx)
-{
- struct device *dev = ctx->dev;
- struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);
- u8 buf[CT3D_BEH_LEN] = {0};
- int ret;
-
- GS_DCS_WRITE_CMD(dev, 0xF0, 0x55, 0xAA, 0x52, 0x08, 0x04);
-
- ret = mipi_dsi_dcs_read(dsi, 0xBE, buf, CT3D_BEH_LEN);
- if (ret != CT3D_BEH_LEN) {
- dev_warn(dev, "Unable to read BEh values (ret = %d)\n", ret);
- return -EIO;
- }
-
- if (buf[0] != 0 || buf[1] != 2 || buf[2] != 0 || buf[5] != 0 || buf[7] != 0
- || buf[8] != 6 || buf[9] != 3)
- return -EAGAIN;
-
- return 0;
-}
-
static int ct3d_enable(struct drm_panel *panel)
{
struct gs_panel *ctx = container_of(panel, struct gs_panel, base);
@@ -447,28 +423,6 @@
gs_panel_reset_helper(ctx);
gs_panel_send_cmdset(ctx, &ct3d_init_cmdset);
ct3d_change_frequency(ctx, pmode);
-
- if (ct3d_read_beh(ctx)) {
- int retry;
- int ret = 1;
-
- dev_warn(dev, "Reading BEh failed at first try reset the panel\n");
-
- for (retry = 0; retry < CT3D_READ_BEH_RETRY_COUNT && ret; retry++) {
- gs_panel_reset_helper(ctx);
- gs_panel_send_cmdset(ctx, &ct3d_init_cmdset);
- ct3d_change_frequency(ctx, pmode);
- /* delay 20ms make sure read BEh successful */
- GS_DCS_WRITE_DELAY_CMD(dev, 20, 0x00);
- ret = ct3d_read_beh(ctx);
- }
-
- if (retry == CT3D_READ_BEH_RETRY_COUNT)
- dev_warn(dev, "Failed to read BEh %d times\n", retry);
- else
- dev_dbg(dev, "Success to read BEh after retry %d time(s)\n", retry);
- }
-
ct3d_dimming_frame_setting(ctx, CT3D_DIMMING_FRAME);
if (pmode->gs_mode.is_lp_mode)
