Skip to content

Commit

Permalink
FROMGIT: drm/mipi-dsi: wrap more functions for streamline handling
Browse files Browse the repository at this point in the history 
Follow the pattern of mipi_dsi_dcs_*_multi() and wrap several existing
MIPI DSI functions to use the context for processing. This simplifies
and streamlines driver code to use simpler code pattern.

Note, msleep function is also wrapped in this way as it is frequently
called inbetween other mipi_dsi_dcs_*() functions.

Signed-off-by: Dmitry Baryshkov <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
Reviewed-by: Neil Armstrong <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Neil Armstrong <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit f79d6d2)
Signed-off-by: Neil Armstrong <[email protected]>
  • Loading branch information
@lumag @barni2000
lumag authored and barni2000 committed Jul 25, 2024
1 parent 7c5c096 commit d3be777
Show file tree
Hide file tree
Showing 2 changed files with 231 additions and 0 deletions.
210 changes: 210 additions & 0 deletions drivers/gpu/drm/drm_mipi_dsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,216 @@ int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi,
}
EXPORT_SYMBOL(mipi_dsi_dcs_get_display_brightness_large);

/**
* mipi_dsi_picture_parameter_set_multi() - transmit the DSC PPS to the peripheral
* @ctx: Context for multiple DSI transactions
* @pps: VESA DSC 1.1 Picture Parameter Set
*
* Like mipi_dsi_picture_parameter_set() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_picture_parameter_set_multi(struct mipi_dsi_multi_context *ctx,
const struct drm_dsc_picture_parameter_set *pps)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_picture_parameter_set(dsi, pps);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending PPS failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_picture_parameter_set_multi);

/**
* mipi_dsi_compression_mode_ext_multi() - enable/disable DSC on the peripheral
* @ctx: Context for multiple DSI transactions
* @enable: Whether to enable or disable the DSC
* @algo: Selected compression algorithm
* @pps_selector: Select PPS from the table of pre-stored or uploaded PPS entries
*
* Like mipi_dsi_compression_mode_ext() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_compression_mode_ext_multi(struct mipi_dsi_multi_context *ctx,
bool enable,
enum mipi_dsi_compression_algo algo,
unsigned int pps_selector)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_compression_mode_ext(dsi, enable, algo, pps_selector);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending COMPRESSION_MODE failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_compression_mode_ext_multi);

/**
* mipi_dsi_dcs_nop_multi() - send DCS NOP packet
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_nop() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_nop_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_nop(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS NOP failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_nop_multi);

/**
* mipi_dsi_dcs_enter_sleep_mode_multi() - send DCS ENTER_SLEEP_MODE packet
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_enter_sleep_mode() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_enter_sleep_mode_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS ENTER_SLEEP_MODE failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_enter_sleep_mode_multi);

/**
* mipi_dsi_dcs_exit_sleep_mode_multi() - send DCS EXIT_SLEEP_MODE packet
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_exit_sleep_mode() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_exit_sleep_mode_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS EXIT_SLEEP_MODE failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_exit_sleep_mode_multi);

/**
* mipi_dsi_dcs_set_display_off_multi() - send DCS SET_DISPLAY_OFF packet
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_set_display_off() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_display_off_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_set_display_off(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS SET_DISPLAY_OFF failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_display_off_multi);

/**
* mipi_dsi_dcs_set_display_on_multi() - send DCS SET_DISPLAY_ON packet
* @ctx: Context for multiple DSI transactions
*
* Like mipi_dsi_dcs_set_display_on() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_display_on_multi(struct mipi_dsi_multi_context *ctx)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_set_display_on(dsi);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS SET_DISPLAY_ON failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_display_on_multi);

/**
* mipi_dsi_dcs_set_tear_on_multi() - send DCS SET_TEAR_ON packet
* @ctx: Context for multiple DSI transactions
* @mode: the Tearing Effect Output Line mode
*
* Like mipi_dsi_dcs_set_tear_on() but deals with errors in a way that
* makes it convenient to make several calls in a row.
*/
void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx,
enum mipi_dsi_dcs_tear_mode mode)
{
struct mipi_dsi_device *dsi = ctx->dsi;
struct device *dev = &dsi->dev;
ssize_t ret;

if (ctx->accum_err)
return;

ret = mipi_dsi_dcs_set_tear_on(dsi, mode);
if (ret < 0) {
ctx->accum_err = ret;
dev_err(dev, "sending DCS SET_TEAR_ON failed: %d\n",
ctx->accum_err);
}
}
EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on_multi);

static int mipi_dsi_drv_probe(struct device *dev)
{
struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver);
Expand Down
21 changes: 21 additions & 0 deletions include/drm/drm_mipi_dsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,13 @@ int mipi_dsi_compression_mode_ext(struct mipi_dsi_device *dsi, bool enable,
int mipi_dsi_picture_parameter_set(struct mipi_dsi_device *dsi,
const struct drm_dsc_picture_parameter_set *pps);

void mipi_dsi_compression_mode_ext_multi(struct mipi_dsi_multi_context *ctx,
bool enable,
enum mipi_dsi_compression_algo algo,
unsigned int pps_selector);
void mipi_dsi_picture_parameter_set_multi(struct mipi_dsi_multi_context *ctx,
const struct drm_dsc_picture_parameter_set *pps);

ssize_t mipi_dsi_generic_write(struct mipi_dsi_device *dsi, const void *payload,
size_t size);
int mipi_dsi_generic_write_chatty(struct mipi_dsi_device *dsi,
Expand All @@ -284,6 +291,12 @@ void mipi_dsi_generic_write_multi(struct mipi_dsi_multi_context *ctx,
ssize_t mipi_dsi_generic_read(struct mipi_dsi_device *dsi, const void *params,
size_t num_params, void *data, size_t size);

#define mipi_dsi_msleep(ctx, delay) \
do { \
if (!ctx.accum_err) \
msleep(delay); \
} while (0)

/**
* enum mipi_dsi_dcs_tear_mode - Tearing Effect Output Line mode
* @MIPI_DSI_DCS_TEAR_MODE_VBLANK: the TE output line consists of V-Blanking
Expand Down Expand Up @@ -338,6 +351,14 @@ int mipi_dsi_dcs_set_display_brightness_large(struct mipi_dsi_device *dsi,
int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi,
u16 *brightness);

void mipi_dsi_dcs_nop_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_enter_sleep_mode_multi(struct mipi_dsi_multi_context *ctx);
void mipi_dsi_dcs_exit_sleep_mode_multi(struct mipi_dsi_multi_context *ctx);
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_tear_on_multi(struct mipi_dsi_multi_context *ctx,
enum mipi_dsi_dcs_tear_mode mode);

/**
* mipi_dsi_generic_write_seq - transmit data using a generic write packet
*
Expand Down

0 comments on commit d3be777

Please sign in to comment.