Commit 5ddb0a8a authored by Tejas Vipin's avatar Tejas Vipin Committed by Douglas Anderson

drm/mipi-dsi: add more multi functions for better error handling

Add more functions that can benefit from being multi style and mark
older variants as deprecated to eventually convert all mipi_dsi functions
to multi style.
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarTejas Vipin <tejasvipin76@gmail.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Acked-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
[dianders: Fixed whitespace warning when applying]
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240806135949.468636-2-tejasvipin76@gmail.com
parent be280fdd
...@@ -603,6 +603,8 @@ EXPORT_SYMBOL(mipi_dsi_shutdown_peripheral); ...@@ -603,6 +603,8 @@ EXPORT_SYMBOL(mipi_dsi_shutdown_peripheral);
* mipi_dsi_turn_on_peripheral() - sends a Turn On Peripheral command * mipi_dsi_turn_on_peripheral() - sends a Turn On Peripheral command
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_turn_on_peripheral_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_turn_on_peripheral(struct mipi_dsi_device *dsi) int mipi_dsi_turn_on_peripheral(struct mipi_dsi_device *dsi)
...@@ -652,6 +654,7 @@ EXPORT_SYMBOL(mipi_dsi_set_maximum_return_packet_size); ...@@ -652,6 +654,7 @@ EXPORT_SYMBOL(mipi_dsi_set_maximum_return_packet_size);
* @pps_selector: Select PPS from the table of pre-stored or uploaded PPS entries * @pps_selector: Select PPS from the table of pre-stored or uploaded PPS entries
* *
* Enable or disable Display Stream Compression on the peripheral. * Enable or disable Display Stream Compression on the peripheral.
* This function is deprecated. Use mipi_dsi_compression_mode_ext_multi() instead.
* *
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
...@@ -703,6 +706,7 @@ EXPORT_SYMBOL(mipi_dsi_compression_mode); ...@@ -703,6 +706,7 @@ EXPORT_SYMBOL(mipi_dsi_compression_mode);
* @pps: VESA DSC 1.1 Picture Parameter Set * @pps: VESA DSC 1.1 Picture Parameter Set
* *
* Transmit the VESA DSC 1.1 Picture Parameter Set to the peripheral. * Transmit the VESA DSC 1.1 Picture Parameter Set to the peripheral.
* This function is deprecated. Use mipi_dsi_picture_parameter_set_multi() instead.
* *
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
...@@ -1037,6 +1041,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_read); ...@@ -1037,6 +1041,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_read);
* mipi_dsi_dcs_nop() - send DCS nop packet * mipi_dsi_dcs_nop() - send DCS nop packet
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_nop_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi)
...@@ -1055,6 +1061,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_nop); ...@@ -1055,6 +1061,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_nop);
* mipi_dsi_dcs_soft_reset() - perform a software reset of the display module * mipi_dsi_dcs_soft_reset() - perform a software reset of the display module
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_soft_reset_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi)
...@@ -1124,6 +1132,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_get_pixel_format); ...@@ -1124,6 +1132,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_get_pixel_format);
* display module except interface communication * display module except interface communication
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_enter_sleep_mode_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_enter_sleep_mode(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_enter_sleep_mode(struct mipi_dsi_device *dsi)
...@@ -1143,6 +1153,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_enter_sleep_mode); ...@@ -1143,6 +1153,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_enter_sleep_mode);
* module * module
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_exit_sleep_mode_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_exit_sleep_mode(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_exit_sleep_mode(struct mipi_dsi_device *dsi)
...@@ -1162,6 +1174,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_exit_sleep_mode); ...@@ -1162,6 +1174,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_exit_sleep_mode);
* display device * display device
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_set_display_off_multi() instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_set_display_off(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_set_display_off(struct mipi_dsi_device *dsi)
...@@ -1181,6 +1195,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_display_off); ...@@ -1181,6 +1195,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_display_off);
* display device * display device
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* *
* This function is deprecated. Use mipi_dsi_dcs_set_display_on_multi() instead.
*
* Return: 0 on success or a negative error code on failure * Return: 0 on success or a negative error code on failure
*/ */
int mipi_dsi_dcs_set_display_on(struct mipi_dsi_device *dsi) int mipi_dsi_dcs_set_display_on(struct mipi_dsi_device *dsi)
...@@ -1202,6 +1218,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_display_on); ...@@ -1202,6 +1218,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_display_on);
* @start: first column of frame memory * @start: first column of frame memory
* @end: last column of frame memory * @end: last column of frame memory
* *
* This function is deprecated. Use mipi_dsi_dcs_set_column_address_multi()
* instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start, int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start,
...@@ -1226,6 +1245,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_column_address); ...@@ -1226,6 +1245,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_column_address);
* @start: first page of frame memory * @start: first page of frame memory
* @end: last page of frame memory * @end: last page of frame memory
* *
* This function is deprecated. Use mipi_dsi_dcs_set_page_address_multi()
* instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start, int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start,
...@@ -1268,6 +1290,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_off); ...@@ -1268,6 +1290,8 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_off);
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* @mode: the Tearing Effect Output Line mode * @mode: the Tearing Effect Output Line mode
* *
* This function is deprecated. Use mipi_dsi_dcs_set_tear_on_multi() instead.
*
* Return: 0 on success or a negative error code on failure * Return: 0 on success or a negative error code on failure
*/ */
int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi, int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,
...@@ -1291,6 +1315,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on); ...@@ -1291,6 +1315,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on);
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* @format: pixel format * @format: pixel format
* *
* This function is deprecated. Use mipi_dsi_dcs_set_pixel_format_multi()
* instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format) int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format)
...@@ -1334,6 +1361,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_scanline); ...@@ -1334,6 +1361,9 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_scanline);
* @dsi: DSI peripheral device * @dsi: DSI peripheral device
* @brightness: brightness value * @brightness: brightness value
* *
* This function is deprecated. Use mipi_dsi_dcs_set_display_brightness_multi()
* instead.
*
* Return: 0 on success or a negative error code on failure. * Return: 0 on success or a negative error code on failure.
*/ */
int mipi_dsi_dcs_set_display_brightness(struct mipi_dsi_device *dsi, int mipi_dsi_dcs_set_display_brightness(struct mipi_dsi_device *dsi,
...@@ -1639,6 +1669,170 @@ void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx, ...@@ -1639,6 +1669,170 @@ void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx,
} }
EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on_multi); EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on_multi);
/**
* mipi_dsi_turn_on_peripheral_multi() - sends a Turn On Peripheral command
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_turn_on_peripheral() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_turn_on_peripheral_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_turn_on_peripheral(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to turn on peripheral: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_turn_on_peripheral_multi);
/**
* mipi_dsi_dcs_soft_reset_multi() - perform a software reset of the display module
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_soft_reset() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_soft_reset_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_dcs_soft_reset(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to mipi_dsi_dcs_soft_reset: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_soft_reset_multi);
/**
* mipi_dsi_dcs_set_display_brightness_multi() - sets the brightness value of
* the display
* @ctx: Context for multiple DSI transactions
* @brightness: brightness value
*
* Like mipi_dsi_dcs_set_display_brightness() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_display_brightness_multi(struct mipi_dsi_multi_context *ctx,
u16 brightness)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_dcs_set_display_brightness(dsi, brightness);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to write display brightness: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_display_brightness_multi);
/**
* mipi_dsi_dcs_set_pixel_format_multi() - sets the pixel format for the RGB image
* data used by the interface
* @ctx: Context for multiple DSI transactions
* @format: pixel format
*
* Like mipi_dsi_dcs_set_pixel_format() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_pixel_format_multi(struct mipi_dsi_multi_context *ctx,
u8 format)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_dcs_set_pixel_format(dsi, format);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to set pixel format: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format_multi);
/**
* mipi_dsi_dcs_set_column_address_multi() - define the column extent of the
* frame memory accessed by the host processor
* @ctx: Context for multiple DSI transactions
* @start: first column of frame memory
* @end: last column of frame memory
*
* Like mipi_dsi_dcs_set_column_address() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_column_address_multi(struct mipi_dsi_multi_context *ctx,
u16 start, u16 end)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_dcs_set_column_address(dsi, start, end);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to set column address: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_column_address_multi);
/**
* mipi_dsi_dcs_set_page_address_multi() - define the page extent of the
* frame memory accessed by the host processor
* @ctx: Context for multiple DSI transactions
* @start: first page of frame memory
* @end: last page of frame memory
*
* Like mipi_dsi_dcs_set_page_address() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_page_address_multi(struct mipi_dsi_multi_context *ctx,
u16 start, u16 end)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
int ret;
if (ctx->accum_err)
return;
ret = mipi_dsi_dcs_set_page_address(dsi, start, end);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "Failed to set page address: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_page_address_multi);
static int mipi_dsi_drv_probe(struct device *dev) static int mipi_dsi_drv_probe(struct device *dev)
{ {
struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver); struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver);
......
...@@ -365,6 +365,16 @@ void mipi_dsi_dcs_set_display_off_multi(struct mipi_dsi_multi_context *ctx); ...@@ -365,6 +365,16 @@ void mipi_dsi_dcs_set_display_off_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_set_display_on_multi(struct mipi_dsi_multi_context *ctx); void mipi_dsi_dcs_set_display_on_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx, void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx,
enum mipi_dsi_dcs_tear_mode mode); enum mipi_dsi_dcs_tear_mode mode);
void mipi_dsi_turn_on_peripheral_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_soft_reset_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_set_display_brightness_multi(struct mipi_dsi_multi_context *ctx,
u16 brightness);
void mipi_dsi_dcs_set_pixel_format_multi(struct mipi_dsi_multi_context *ctx,
u8 format);
void mipi_dsi_dcs_set_column_address_multi(struct mipi_dsi_multi_context *ctx,
u16 start, u16 end);
void mipi_dsi_dcs_set_page_address_multi(struct mipi_dsi_multi_context *ctx,
u16 start, u16 end);
/** /**
* mipi_dsi_generic_write_seq - transmit data using a generic write packet * mipi_dsi_generic_write_seq - transmit data using a generic write packet
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment