Skip to content

Commit ffc23a2

Browse files
brighamcampbelldianders
authored andcommitted
drm: Add MIPI read_multi func and two write macros
Create mipi_dsi_dcs_read_multi(), which accepts a mipi_dsi_multi_context struct for improved error handling and cleaner panel driver code. Create mipi_dsi_dcs_write_var_seq_multi() and mipi_dsi_generic_write_var_seq_multi() macros which allow MIPI panel drivers to write non-constant data to display controllers. Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Brigham Campbell <me@brighamcampbell.com> Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://lore.kernel.org/r/20250731032343.1258366-3-me@brighamcampbell.com
1 parent 0070851 commit ffc23a2

2 files changed

Lines changed: 72 additions & 0 deletions

File tree

drivers/gpu/drm/drm_mipi_dsi.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,43 @@ ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data,
10961096
}
10971097
EXPORT_SYMBOL(mipi_dsi_dcs_read);
10981098

1099+
/**
1100+
* mipi_dsi_dcs_read_multi() - mipi_dsi_dcs_read() w/ accum_err
1101+
* @ctx: Context for multiple DSI transactions
1102+
* @cmd: DCS command
1103+
* @data: buffer in which to receive data
1104+
* @len: size of receive buffer
1105+
*
1106+
* Like mipi_dsi_dcs_read() but deals with errors in a way that makes it
1107+
* convenient to make several calls in a row.
1108+
*/
1109+
void mipi_dsi_dcs_read_multi(struct mipi_dsi_multi_context *ctx, u8 cmd,
1110+
void *data, size_t len)
1111+
{
1112+
struct mipi_dsi_device *dsi = ctx->dsi;
1113+
struct device *dev = &dsi->dev;
1114+
struct mipi_dsi_msg msg = {
1115+
.channel = dsi->channel,
1116+
.type = MIPI_DSI_DCS_READ,
1117+
.tx_buf = &cmd,
1118+
.tx_len = 1,
1119+
.rx_buf = data,
1120+
.rx_len = len
1121+
};
1122+
ssize_t ret;
1123+
1124+
if (ctx->accum_err)
1125+
return;
1126+
1127+
ret = mipi_dsi_device_transfer(dsi, &msg);
1128+
if (ret < 0) {
1129+
ctx->accum_err = ret;
1130+
dev_err(dev, "dcs read with command %#x failed: %d\n", cmd,
1131+
ctx->accum_err);
1132+
}
1133+
}
1134+
EXPORT_SYMBOL(mipi_dsi_dcs_read_multi);
1135+
10991136
/**
11001137
* mipi_dsi_dcs_nop() - send DCS nop packet
11011138
* @dsi: DSI peripheral device

include/drm/drm_mipi_dsi.h

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ ssize_t mipi_dsi_dcs_write(struct mipi_dsi_device *dsi, u8 cmd,
342342
const void *data, size_t len);
343343
ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data,
344344
size_t len);
345+
void mipi_dsi_dcs_read_multi(struct mipi_dsi_multi_context *ctx, u8 cmd,
346+
void *data, size_t len);
345347
int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi);
346348
int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi);
347349
int mipi_dsi_dcs_get_power_mode(struct mipi_dsi_device *dsi, u8 *mode);
@@ -403,6 +405,22 @@ void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_multi_context *ctx);
403405
mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \
404406
} while (0)
405407

408+
/**
409+
* mipi_dsi_generic_write_var_seq_multi - transmit non-constant data using a
410+
* generic write packet
411+
*
412+
* This macro will print errors for you and error handling is optimized for
413+
* callers that call this multiple times in a row.
414+
*
415+
* @ctx: Context for multiple DSI transactions
416+
* @seq: buffer containing the payload
417+
*/
418+
#define mipi_dsi_generic_write_var_seq_multi(ctx, seq...) \
419+
do { \
420+
const u8 d[] = { seq }; \
421+
mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \
422+
} while (0)
423+
406424
/**
407425
* mipi_dsi_dcs_write_seq_multi - transmit a DCS command with payload
408426
*
@@ -419,6 +437,23 @@ void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_multi_context *ctx);
419437
mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \
420438
} while (0)
421439

440+
/**
441+
* mipi_dsi_dcs_write_var_seq_multi - transmit a DCS command with non-constant
442+
* payload
443+
*
444+
* This macro will print errors for you and error handling is optimized for
445+
* callers that call this multiple times in a row.
446+
*
447+
* @ctx: Context for multiple DSI transactions
448+
* @cmd: Command
449+
* @seq: buffer containing data to be transmitted
450+
*/
451+
#define mipi_dsi_dcs_write_var_seq_multi(ctx, cmd, seq...) \
452+
do { \
453+
const u8 d[] = { cmd, seq }; \
454+
mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \
455+
} while (0)
456+
422457
/**
423458
* mipi_dsi_dual - send the same MIPI DSI command to two interfaces
424459
*

0 commit comments

Comments
 (0)