Commit fb13d349 authored by Tejas Vipin's avatar Tejas Vipin Committed by Neil Armstrong
Browse files

drm/mipi-dsi: extend "multi" functions and use them in sony-td4353-jdi 



Removes mipi_dsi_dcs_set_tear_off and replaces it with a
multi version as after replacing it in sony-td4353-jdi, it doesn't
appear anywhere else. sony-td4353-jdi is converted to use multi style
functions, including mipi_dsi_dcs_set_tear_off_multi.

Signed-off-by: default avatarTejas Vipin <tejasvipin76@gmail.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20250220045721.145905-1-tejasvipin76@gmail.com


Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250220045721.145905-1-tejasvipin76@gmail.com
parent 4d098000

drivers/gpu/drm/drm_mipi_dsi.c

+23 −19
Original line number Diff line number Diff line
@@ -1265,25 +1265,6 @@ int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start, 
}

EXPORT_SYMBOL(mipi_dsi_dcs_set_page_address);



/**

 * mipi_dsi_dcs_set_tear_off() - turn off the display module's Tearing Effect

 *    output signal on the TE signal line

 * @dsi: DSI peripheral device

 *

 * Return: 0 on success or a negative error code on failure

 */

int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi)

{

	ssize_t err;



	err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_TEAR_OFF, NULL, 0);

	if (err < 0)

		return err;



	return 0;

}

EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_off);



/**

 * mipi_dsi_dcs_set_tear_on() - turn on the display module's Tearing Effect

 *    output signal on the TE signal line.
@@ -1713,6 +1694,29 @@ void mipi_dsi_turn_on_peripheral_multi(struct mipi_dsi_multi_context *ctx) 
}

EXPORT_SYMBOL(mipi_dsi_turn_on_peripheral_multi);



/**

 * mipi_dsi_dcs_set_tear_off_multi() - turn off the display module's Tearing Effect

 *    output signal on the TE signal line

 * @ctx: Context for multiple DSI transactions

 */

void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_multi_context *ctx)

{

	struct mipi_dsi_device *dsi = ctx->dsi;

	struct device *dev = &dsi->dev;

	ssize_t err;



	if (ctx->accum_err)

		return;



	err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_TEAR_OFF, NULL, 0);

	if (err < 0) {

		ctx->accum_err = err;

		dev_err(dev, "Failed to set tear off: %d\n",

			ctx->accum_err);

	}

}

EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_off_multi);



/**

 * mipi_dsi_dcs_soft_reset_multi() - perform a software reset of the display module

 * @ctx: Context for multiple DSI transactions

drivers/gpu/drm/panel/panel-sony-td4353-jdi.c

+23 −84
Original line number Diff line number Diff line
@@ -47,93 +47,40 @@ static inline struct sony_td4353_jdi *to_sony_td4353_jdi(struct drm_panel *panel 
static int sony_td4353_jdi_on(struct sony_td4353_jdi *ctx)

{

	struct mipi_dsi_device *dsi = ctx->dsi;

	struct device *dev = &dsi->dev;

	int ret;

	struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };



	dsi->mode_flags |= MIPI_DSI_MODE_LPM;



	ret = mipi_dsi_dcs_set_column_address(dsi, 0x0000, 1080 - 1);

	if (ret < 0) {

		dev_err(dev, "Failed to set column address: %d\n", ret);

		return ret;

	}



	ret = mipi_dsi_dcs_set_page_address(dsi, 0x0000, 2160 - 1);

	if (ret < 0) {

		dev_err(dev, "Failed to set page address: %d\n", ret);

		return ret;

	}



	ret = mipi_dsi_dcs_set_tear_scanline(dsi, 0);

	if (ret < 0) {

		dev_err(dev, "Failed to set tear scanline: %d\n", ret);

		return ret;

	}



	ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);

	if (ret < 0) {

		dev_err(dev, "Failed to set tear on: %d\n", ret);

		return ret;

	}

	mipi_dsi_dcs_set_column_address_multi(&dsi_ctx, 0x0000, 1080 - 1);

	mipi_dsi_dcs_set_page_address_multi(&dsi_ctx, 0x0000, 2160 - 1);

	mipi_dsi_dcs_set_tear_scanline_multi(&dsi_ctx, 0);

	mipi_dsi_dcs_set_tear_on_multi(&dsi_ctx, MIPI_DSI_DCS_TEAR_MODE_VBLANK);

	mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_SET_ADDRESS_MODE, 0x00);



	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_ADDRESS_MODE, 0x00);



	ret = mipi_dsi_dcs_set_pixel_format(dsi, 0x77);

	if (ret < 0) {

		dev_err(dev, "Failed to set pixel format: %d\n", ret);

		return ret;

	}



	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_PARTIAL_ROWS,

	mipi_dsi_dcs_set_pixel_format_multi(&dsi_ctx, 0x77);

	mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_SET_PARTIAL_ROWS,

				     0x00, 0x00, 0x08, 0x6f);



	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(70);



	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_MEMORY_START);

	mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);

	mipi_dsi_msleep(&dsi_ctx, 70);

	mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_MEMORY_START);

	mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);



	ret = mipi_dsi_dcs_set_display_on(dsi);

	if (ret < 0) {

		dev_err(dev, "Failed to turn display on: %d\n", ret);

		return ret;

	return dsi_ctx.accum_err;

}



	return 0;

}



static int sony_td4353_jdi_off(struct sony_td4353_jdi *ctx)

static void sony_td4353_jdi_off(struct sony_td4353_jdi *ctx)

{

	struct mipi_dsi_device *dsi = ctx->dsi;

	struct device *dev = &dsi->dev;

	int ret;

	struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };



	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(22);



	ret = mipi_dsi_dcs_set_tear_off(dsi);

	if (ret < 0) {

		dev_err(dev, "Failed to set tear off: %d\n", ret);

		return ret;

	}



	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);

	if (ret < 0) {

		dev_err(dev, "Failed to enter sleep mode: %d\n", ret);

		return ret;

	}

	msleep(80);



	return 0;

	mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);

	mipi_dsi_msleep(&dsi_ctx, 22);

	mipi_dsi_dcs_set_tear_off_multi(&dsi_ctx);

	mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);

	mipi_dsi_msleep(&dsi_ctx, 80);

}



static void sony_td4353_assert_reset_gpios(struct sony_td4353_jdi *ctx, int mode)
@@ -146,14 +93,11 @@ static void sony_td4353_assert_reset_gpios(struct sony_td4353_jdi *ctx, int mode 
static int sony_td4353_jdi_prepare(struct drm_panel *panel)

{

	struct sony_td4353_jdi *ctx = to_sony_td4353_jdi(panel);

	struct device *dev = &ctx->dsi->dev;

	int ret;



	ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);

	if (ret < 0) {

		dev_err(dev, "Failed to enable regulators: %d\n", ret);

	if (ret < 0)

		return ret;

	}



	msleep(100);
@@ -161,7 +105,6 @@ static int sony_td4353_jdi_prepare(struct drm_panel *panel) 


	ret = sony_td4353_jdi_on(ctx);

	if (ret < 0) {

		dev_err(dev, "Failed to power on panel: %d\n", ret);

		sony_td4353_assert_reset_gpios(ctx, 0);

		regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);

		return ret;
@@ -173,12 +116,8 @@ static int sony_td4353_jdi_prepare(struct drm_panel *panel) 
static int sony_td4353_jdi_unprepare(struct drm_panel *panel)

{

	struct sony_td4353_jdi *ctx = to_sony_td4353_jdi(panel);

	struct device *dev = &ctx->dsi->dev;

	int ret;



	ret = sony_td4353_jdi_off(ctx);

	if (ret < 0)

		dev_err(dev, "Failed to power off panel: %d\n", ret);

	sony_td4353_jdi_off(ctx);



	sony_td4353_assert_reset_gpios(ctx, 0);

	regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);

include/drm/drm_mipi_dsi.h

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start, 
				    u16 end);

int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start,

				  u16 end);

int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi);

int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,

			     enum mipi_dsi_dcs_tear_mode mode);

int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format);
@@ -379,6 +378,7 @@ void mipi_dsi_dcs_set_page_address_multi(struct mipi_dsi_multi_context *ctx, 
					 u16 start, u16 end);

void mipi_dsi_dcs_set_tear_scanline_multi(struct mipi_dsi_multi_context *ctx,

					  u16 scanline);

void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_multi_context *ctx);



/**

 * mipi_dsi_generic_write_seq - transmit data using a generic write packet