drm/panel: boe-bf060y8m-aj0: transition to mipi_dsi wrapped functions

Changes the boe-bf060y8m-aj0 panel to use multi style functions for
improved error handling. Additionally the MIPI_DSI_MODE_LPM flag is set
after the off commands are run in boe_bf060y8m_aj0_off regardless of any
failures, and regulators are disabled if the boe_bf060y8m_aj0_on call in
boe_bf060y8m_aj0_prepare fails.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20250413035959.255842-1-tejasvipin76@gmail.com

diff --git a/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c b/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
index 5eb0727438cd73360f5360aba55f1eb1659fc7c6..84c21c62a43e4bb838a25e7cbc826c316c2da5df 100644 (file)
--- a/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
+++ b/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
@@ -55,77 +55,56 @@ static void boe_bf060y8m_aj0_reset(struct boe_bf060y8m_aj0 *boe)
 static int boe_bf060y8m_aj0_on(struct boe_bf060y8m_aj0 *boe)
 {
        struct mipi_dsi_device *dsi = boe->dsi;
-       struct device *dev = &dsi->dev;
-       int ret;
-
-       mipi_dsi_dcs_write_seq(dsi, 0xb0, 0xa5, 0x00);
-       mipi_dsi_dcs_write_seq(dsi, 0xb2, 0x00, 0x4c);
-       mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_3D_CONTROL, 0x10);
-       mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_POWER_SAVE, DCS_ALLOW_HBM_RANGE);
-       mipi_dsi_dcs_write_seq(dsi, 0xf8,
-                              0x00, 0x08, 0x10, 0x00, 0x22, 0x00, 0x00, 0x2d);
-
-       ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
-       if (ret < 0) {
-               dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
-               return ret;
-       }
-       msleep(30);
-
-       mipi_dsi_dcs_write_seq(dsi, 0xb0, 0xa5, 0x00);
-       mipi_dsi_dcs_write_seq(dsi, 0xc0,
-                              0x08, 0x48, 0x65, 0x33, 0x33, 0x33,
-                              0x2a, 0x31, 0x39, 0x20, 0x09);
-       mipi_dsi_dcs_write_seq(dsi, 0xc1, 0x00, 0x00, 0x00, 0x1f, 0x1f,
-                              0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-                              0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f);
-       mipi_dsi_dcs_write_seq(dsi, 0xe2, 0x20, 0x04, 0x10, 0x12, 0x92,
-                              0x4f, 0x8f, 0x44, 0x84, 0x83, 0x83, 0x83,
-                              0x5c, 0x5c, 0x5c);
-       mipi_dsi_dcs_write_seq(dsi, 0xde, 0x01, 0x2c, 0x00, 0x77, 0x3e);
-
-       msleep(30);
-
-       ret = mipi_dsi_dcs_set_display_on(dsi);
-       if (ret < 0) {
-               dev_err(dev, "Failed to set display on: %d\n", ret);
-               return ret;
-       }
-       msleep(50);
-
-       return 0;
+       struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
+
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xb0, 0xa5, 0x00);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xb2, 0x00, 0x4c);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_SET_3D_CONTROL, 0x10);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_POWER_SAVE, DCS_ALLOW_HBM_RANGE);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xf8,
+                                    0x00, 0x08, 0x10, 0x00, 0x22, 0x00, 0x00, 0x2d);
+
+       mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);
+       mipi_dsi_msleep(&dsi_ctx, 30);
+
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xb0, 0xa5, 0x00);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xc0,
+                                    0x08, 0x48, 0x65, 0x33, 0x33, 0x33,
+                                    0x2a, 0x31, 0x39, 0x20, 0x09);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xc1, 0x00, 0x00, 0x00, 0x1f, 0x1f,
+                                    0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+                                    0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xe2, 0x20, 0x04, 0x10, 0x12, 0x92,
+                                    0x4f, 0x8f, 0x44, 0x84, 0x83, 0x83, 0x83,
+                                    0x5c, 0x5c, 0x5c);
+       mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xde, 0x01, 0x2c, 0x00, 0x77, 0x3e);
+
+       mipi_dsi_msleep(&dsi_ctx, 30);
+
+       mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);
+       mipi_dsi_msleep(&dsi_ctx, 50);
+
+       return dsi_ctx.accum_err;
 }
 
-static int boe_bf060y8m_aj0_off(struct boe_bf060y8m_aj0 *boe)
+static void boe_bf060y8m_aj0_off(struct boe_bf060y8m_aj0 *boe)
 {
        struct mipi_dsi_device *dsi = boe->dsi;
-       struct device *dev = &dsi->dev;
-       int ret;
+       struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
 
        /* OFF commands sent in HS mode */
        dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
-       ret = mipi_dsi_dcs_set_display_off(dsi);
-       if (ret < 0) {
-               dev_err(dev, "Failed to set display off: %d\n", ret);
-               return ret;
-       }
-       msleep(20);
+       mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);
+       mipi_dsi_msleep(&dsi_ctx, 20);
 
-       ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
-       if (ret < 0) {
-               dev_err(dev, "Failed to enter sleep mode: %d\n", ret);
-               return ret;
-       }
-       usleep_range(1000, 2000);
+       mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);
+       mipi_dsi_usleep_range(&dsi_ctx, 1000, 2000);
        dsi->mode_flags |= MIPI_DSI_MODE_LPM;
-
-       return 0;
 }
 
 static int boe_bf060y8m_aj0_prepare(struct drm_panel *panel)
 {
        struct boe_bf060y8m_aj0 *boe = to_boe_bf060y8m_aj0(panel);
-       struct device *dev = &boe->dsi->dev;
        int ret;
 
        /*
@@ -157,13 +136,14 @@ static int boe_bf060y8m_aj0_prepare(struct drm_panel *panel)
 
        ret = boe_bf060y8m_aj0_on(boe);
        if (ret < 0) {
-               dev_err(dev, "Failed to initialize panel: %d\n", ret);
                gpiod_set_value_cansleep(boe->reset_gpio, 1);
-               return ret;
+               goto err_on;
        }
 
        return 0;
 
+err_on:
+       regulator_disable(boe->vregs[BF060Y8M_VREG_VCI].consumer);
 err_vci:
        regulator_disable(boe->vregs[BF060Y8M_VREG_VDDIO].consumer);
 err_vddio:
@@ -178,15 +158,11 @@ err_elvss:
 static int boe_bf060y8m_aj0_unprepare(struct drm_panel *panel)
 {
        struct boe_bf060y8m_aj0 *boe = to_boe_bf060y8m_aj0(panel);
-       struct device *dev = &boe->dsi->dev;
-       int ret;
 
-       ret = boe_bf060y8m_aj0_off(boe);
-       if (ret < 0)
-               dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
+       boe_bf060y8m_aj0_off(boe);
 
        gpiod_set_value_cansleep(boe->reset_gpio, 1);
-       ret = regulator_bulk_disable(ARRAY_SIZE(boe->vregs), boe->vregs);
+       regulator_bulk_disable(ARRAY_SIZE(boe->vregs), boe->vregs);
 
        return 0;
 }
@@ -234,13 +210,11 @@ static int boe_bf060y8m_aj0_bl_update_status(struct backlight_device *bl)
 {
        struct mipi_dsi_device *dsi = bl_get_data(bl);
        u16 brightness = backlight_get_brightness(bl);
-       int ret;
+       struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
 
-       ret = mipi_dsi_dcs_set_display_brightness(dsi, brightness);
-       if (ret < 0)
-               return ret;
+       mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, brightness);
 
-       return 0;
+       return dsi_ctx.accum_err;
 }
 
 static int boe_bf060y8m_aj0_bl_get_brightness(struct backlight_device *bl)