Commit c161a2b7 authored by Neil Armstrong's avatar Neil Armstrong
Browse files

drm/panel: visionox-rm69299: switch to _multi variants 



Switch to the DSI _multi variants to simplify error handling.

Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250509-topic-misc-shift6-panel-v2-3-c2c2d52abd51@linaro.org
parent 01a2c675

drivers/gpu/drm/panel/panel-visionox-rm69299.c

+13 −35
Original line number Diff line number Diff line
@@ -72,30 +72,24 @@ static int visionox_rm69299_power_off(struct visionox_rm69299 *ctx) 
static int visionox_rm69299_unprepare(struct drm_panel *panel)

{

	struct visionox_rm69299 *ctx = panel_to_ctx(panel);

	int ret;

	struct mipi_dsi_multi_context dsi_ctx = { .dsi = ctx->dsi };



	ctx->dsi->mode_flags = 0;



	ret = mipi_dsi_dcs_write(ctx->dsi, MIPI_DCS_SET_DISPLAY_OFF, NULL, 0);

	if (ret < 0)

		dev_err(ctx->panel.dev, "set_display_off cmd failed ret = %d\n", ret);

	mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);



	/* 120ms delay required here as per DCS spec */

	msleep(120);



	ret = mipi_dsi_dcs_write(ctx->dsi, MIPI_DCS_ENTER_SLEEP_MODE, NULL, 0);

	if (ret < 0) {

		dev_err(ctx->panel.dev, "enter_sleep cmd failed ret = %d\n", ret);

	}

	mipi_dsi_msleep(&dsi_ctx, 120);



	ret = visionox_rm69299_power_off(ctx);

	mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);



	return ret;

	return visionox_rm69299_power_off(ctx);

}



static int visionox_rm69299_prepare(struct drm_panel *panel)

{

	struct visionox_rm69299 *ctx = panel_to_ctx(panel);

	struct mipi_dsi_multi_context dsi_ctx = { .dsi = ctx->dsi };

	int ret, i;



	ret = visionox_rm69299_power_on(ctx);
@@ -104,36 +98,20 @@ static int visionox_rm69299_prepare(struct drm_panel *panel) 


	ctx->dsi->mode_flags |= MIPI_DSI_MODE_LPM;



	for (i = 0; i < ctx->desc->init_seq_len; i++) {

		ret = mipi_dsi_dcs_write_buffer(ctx->dsi, &ctx->desc->init_seq[i * 2], 2);

		if (ret < 0) {

			dev_err(ctx->panel.dev,	"cmd tx failed, ret = %d\n", ret);

			return ret;

		}

	}

	for (i = 0; i < ctx->desc->init_seq_len; i++)

		mipi_dsi_dcs_write_buffer_multi(&dsi_ctx, &ctx->desc->init_seq[i * 2], 2);



	ret = mipi_dsi_dcs_write(ctx->dsi, MIPI_DCS_EXIT_SLEEP_MODE, NULL, 0);

	if (ret < 0) {

		dev_err(ctx->panel.dev, "exit_sleep_mode cmd failed ret = %d\n", ret);

		goto power_off;

	}

	mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);



	/* Per DSI spec wait 120ms after sending exit sleep DCS command */

	msleep(120);

	mipi_dsi_msleep(&dsi_ctx, 120);



	ret = mipi_dsi_dcs_write(ctx->dsi, MIPI_DCS_SET_DISPLAY_ON, NULL, 0);

	if (ret < 0) {

		dev_err(ctx->panel.dev, "set_display_on cmd failed ret = %d\n", ret);

		goto power_off;

	}

	mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);



	/* Per DSI spec wait 120ms after sending set_display_on DCS command */

	msleep(120);



	return 0;

	mipi_dsi_msleep(&dsi_ctx, 120);



power_off:

	return ret;

	return dsi_ctx.accum_err;

}



static const struct drm_display_mode visionox_rm69299_1080x2248_60hz = {