The mipi_dsi_dcs_*() and mipi_dsi_generic_write() functions used by this driver are deprecated in favour of their _multi() counterparts, as noted in Documentation/gpu/todo.rst. The _multi() variants record the first error in a context structure and skip subsequent calls once an error is set, removing the need to check the return value after each command. They also log failures internally, making the per-call dev_err() calls redundant.
Convert prepare() and unprepare() to use the _multi() equivalents. In prepare(), use mipi_dsi_msleep() instead of plain msleep() so the delay is skipped on prior error, since the function will clean up via the existing disable_iovcc label anyway. In unprepare(), keep plain msleep() since the hardware delay must execute regardless of any prior DSI error. The original code logged a set_display_off() failure and still attempted enter_sleep_mode(), so clear accum_err after set_display_off_multi() to keep that behaviour. An enter_sleep_mode() failure was also only logged, and that stays the same. Cc: Heiko Stuebner <[email protected]> Signed-off-by: Akash Sukhavasi <[email protected]> --- Compile tested only, no hardware available. checkpatch and a W=1 build are clean. --- drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 40 ++++++++-------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c index ff35b62a327e..ee65506477df 100644 --- a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c +++ b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c @@ -489,16 +489,13 @@ static int ltk500hd1829_unprepare(struct drm_panel *panel) { struct ltk500hd1829 *ctx = panel_to_ltk500hd1829(panel); struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); - int ret; - - ret = mipi_dsi_dcs_set_display_off(dsi); - if (ret < 0) - dev_err(panel->dev, "failed to set display off: %d\n", ret); + struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi }; - ret = mipi_dsi_dcs_enter_sleep_mode(dsi); - if (ret < 0) { - dev_err(panel->dev, "failed to enter sleep mode: %d\n", ret); - } + mipi_dsi_dcs_set_display_off_multi(&dsi_ctx); + /* Reset error to continue power-down sequence even if display off failed */ + dsi_ctx.accum_err = 0; + /* Enter sleep mode; error does not prevent power-off */ + mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx); /* 120ms to enter sleep mode */ msleep(120); @@ -513,6 +510,7 @@ static int ltk500hd1829_prepare(struct drm_panel *panel) { struct ltk500hd1829 *ctx = panel_to_ltk500hd1829(panel); struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); + struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi }; unsigned int i; int ret; @@ -535,27 +533,17 @@ static int ltk500hd1829_prepare(struct drm_panel *panel) /* tRT: >= 5ms */ usleep_range(5000, 6000); - for (i = 0; i < ctx->panel_desc->num_init; i++) { - ret = mipi_dsi_generic_write(dsi, &ctx->panel_desc->init[i], + for (i = 0; i < ctx->panel_desc->num_init; i++) + mipi_dsi_generic_write_multi(&dsi_ctx, &ctx->panel_desc->init[i], sizeof(struct ltk500hd1829_cmd)); - if (ret < 0) { - dev_err(panel->dev, "failed to write init cmds: %d\n", ret); - goto disable_iovcc; - } - } - - ret = mipi_dsi_dcs_exit_sleep_mode(dsi); - if (ret < 0) { - dev_err(panel->dev, "failed to exit sleep mode: %d\n", ret); - goto disable_iovcc; - } + mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx); /* 120ms to exit sleep mode */ - msleep(120); + mipi_dsi_msleep(&dsi_ctx, 120); + mipi_dsi_dcs_set_display_on_multi(&dsi_ctx); - ret = mipi_dsi_dcs_set_display_on(dsi); - if (ret < 0) { - dev_err(panel->dev, "failed to set display on: %d\n", ret); + if (dsi_ctx.accum_err) { + ret = dsi_ctx.accum_err; goto disable_iovcc; } -- 2.56.0
