convert mantix-mlaf057we51 to use multi style functions and cleanup
v2 cover convert mantix-mlaf057we51 to use multi style functions and cleanup
Uses mipi_dsi_*_multi function in the mantix-mlaf057we51 panel and converting uppercase hex to lowercase hex for cleanup.
---
Changes in v2:
- Split cleanup changes into separate patch
v1: https://lore.kernel.org/all/[email protected]/
---
Tejas Vipin (2):
drm/panel: mantix-mlaf057we51: transition to mipi_dsi wrapped
functions
drm/panel: mantix-mlaf057we51: write hex in lowercase
.../gpu/drm/panel/panel-mantix-mlaf057we51.c | 79 +++++++------------ 1 file changed, 27 insertions(+), 52 deletions(-)
Signature · 1 line
2.46.0
PATCH v2 1/2 drm/panel: mantix-mlaf057we51: transition to mipi_dsi wrapped functions
Changes the mantix-mlaf057we51 panel to use multi style functions for improved error handling.
--- .../gpu/drm/panel/panel-mantix-mlaf057we51.c | 77 +++++++------------ 1 file changed, 26 insertions(+), 51 deletions(-)
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +26 -51
@@ -45,82 +45,57 @@ static inline struct mantix *panel_to_mantix(struct drm_panel *panel) return container_of(panel, struct mantix, panel); } -static int mantix_init_sequence (struct mantix *ctx) +static void mantix_init_sequence (struct mipi_dsi_multi_context *dsi_ctx) { -struct mipi_dsi_device *dsi =to_mipi_dsi_device (ctx->dev); -struct device *dev = ctx->dev; -/* * Init sequence was supplied by the panel vendor. */ -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ); - -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_INT_CANCEL ,0x03 ); -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x03 ); -mipi_dsi_generic_write_seq (dsi,0x80 ,0xA9 ,0x00 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ); -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x09 ); -mipi_dsi_generic_write_seq (dsi,0x80 ,0x64 ,0x00 ,0x64 ,0x00 ,0x00 ); -msleep (20 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_INT_CANCEL ,0x03 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x03 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xA9 ,0x00 ); -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_SPI_FINISH ,0xA5 ); -mipi_dsi_generic_write_seq (dsi,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2F ); -msleep (20 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x09 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0x64 ,0x00 ,0x64 ,0x00 ,0x00 ); +mipi_dsi_msleep (dsi_ctx,20 ); -dev_dbg (dev,"Panel init sequence done\n" ); -return 0 ; +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xA5 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2F ); +mipi_dsi_msleep (dsi_ctx,20 ); }static int mantix_enable (struct drm_panel *panel) {struct mantix *ctx =panel_to_mantix (panel); -struct device *dev = ctx->dev; -struct mipi_dsi_device *dsi =to_mipi_dsi_device (dev); -int ret; +struct mipi_dsi_device *dsi =to_mipi_dsi_device (ctx->dev); +struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi }; - ret =mantix_init_sequence (ctx); -if (ret <0 ) { -dev_err (ctx->dev,"Panel init sequence failed: %d\n" , ret); -return ret; - } +mantix_init_sequence (&dsi_ctx); +if (!dsi_ctx.accum_err) +dev_dbg (ctx->dev,"Panel init sequence done\n" ); - ret =mipi_dsi_dcs_exit_sleep_mode (dsi); -if (ret <0 ) { -dev_err (dev,"Failed to exit sleep mode\n" ); -return ret; - } -msleep (20 ); +mipi_dsi_dcs_exit_sleep_mode_multi (&dsi_ctx); +mipi_dsi_msleep (&dsi_ctx,20 ); - ret =mipi_dsi_dcs_set_display_on (dsi); -if (ret) -return ret; -usleep_range (10000 ,12000 ); +mipi_dsi_dcs_set_display_on_multi (&dsi_ctx); +mipi_dsi_usleep_range (&dsi_ctx,10000 ,12000 ); - ret =mipi_dsi_turn_on_peripheral (dsi); -if (ret <0 ) { -dev_err (dev,"Failed to turn on peripheral\n" ); -return ret; - } +mipi_dsi_turn_on_peripheral_multi (&dsi_ctx); -return 0 ; +return dsi_ctx.accum_err; }static int mantix_disable (struct drm_panel *panel) {struct mantix *ctx =panel_to_mantix (panel);struct mipi_dsi_device *dsi =to_mipi_dsi_device (ctx->dev); -int ret; - - ret =mipi_dsi_dcs_set_display_off (dsi); -if (ret <0 ) -dev_err (ctx->dev,"Failed to turn off the display: %d\n" , ret); +struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi }; - ret =mipi_dsi_dcs_enter_sleep_mode (dsi); -if (ret <0 ) -dev_err (ctx->dev,"Failed to enter sleep mode: %d\n" , ret); +mipi_dsi_dcs_set_display_off_multi (&dsi_ctx); +mipi_dsi_dcs_enter_sleep_mode_multi (&dsi_ctx); - -return 0 ; +return dsi_ctx.accum_err; }static int mantix_unprepare (struct drm_panel *panel)
Signature · 1 line
2.46.0
PATCH v2 2/2 drm/panel: mantix-mlaf057we51: write hex in lowercase
In reply to Tejas VipinConverts uppercase hex to lowercase hex for cleanup.
--- drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +7 -7
@@ -23,7 +23,7 @@/* Manufacturer specific Commands send via DSI */ #define MANTIX_CMD_OTP_STOP_RELOAD_MIPI 0x41 -#define MANTIX_CMD_INT_CANCEL 0x4C +#define MANTIX_CMD_INT_CANCEL 0x4c#define MANTIX_CMD_SPI_FINISH 0x90struct mantix {
@@ -50,18 +50,18 @@ static void mantix_init_sequence(struct mipi_dsi_multi_context *dsi_ctx)/* * Init sequence was supplied by the panel vendor. */ -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a );mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_INT_CANCEL ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xA9 ,0x00 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x03 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xa9 ,0x00 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x09 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x09 );mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0x64 ,0x00 ,0x64 ,0x00 ,0x00 );mipi_dsi_msleep (dsi_ctx,20 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xA5 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2F ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xa5 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2f );mipi_dsi_msleep (dsi_ctx,20 ); }
Signature · 1 line
2.46.0
Re: [PATCH v2 2/2] drm/panel: mantix-mlaf057we51: write hex in lowercase
Quoted 35 lines · Tejas Vipin
Converts uppercase hex to lowercase hex for cleanup.
Signed-off-by Tejas Vipin <[email protected]>--- drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +5
-5@@ -23,7 +23,7 @@/* Manufacturer specific Commands send via DSI */ #define MANTIX_CMD_OTP_STOP_RELOAD_MIPI 0x41 -#define MANTIX_CMD_INT_CANCEL 0x4C +#define MANTIX_CMD_INT_CANCEL 0x4c#define MANTIX_CMD_SPI_FINISH 0x90struct mantix {@@ -50,18 +50,18 @@ static void mantix_init_sequence(struct mipi_dsi_multi_context *dsi_ctx)/* * Init sequence was supplied by the panel vendor. */ -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a );mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_INT_CANCEL ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xA9 ,0x00 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x03 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xa9 ,0x00 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x09 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x09 );
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c static void mantix_init_sequence(struct mipi_dsi_multi_context *dsi_ctx) · line 67
Quoted 10 lines
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +2
-2mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0x64 ,0x00 ,0x64 ,0x00 ,0x00 );mipi_dsi_msleep (dsi_ctx,20 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xA5 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2F ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xa5 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2f );mipi_dsi_msleep (dsi_ctx,20 ); }
Re: [PATCH v2 2/2] drm/panel: mantix-mlaf057we51: write hex in lowercase
In reply to Tejas VipinHi,
Quoted 34 lines · Tejas Vipin
Converts uppercase hex to lowercase hex for cleanup.
Signed-off-by Tejas Vipin <[email protected]>--- drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +4
-5@@ -23,7 +23,7 @@/* Manufacturer specific Commands send via DSI */ #define MANTIX_CMD_OTP_STOP_RELOAD_MIPI 0x41 -#define MANTIX_CMD_INT_CANCEL 0x4C +#define MANTIX_CMD_INT_CANCEL 0x4c#define MANTIX_CMD_SPI_FINISH 0x90struct mantix {@@ -50,18 +50,18 @@ static void mantix_init_sequence(struct mipi_dsi_multi_context *dsi_ctx)/* * Init sequence was supplied by the panel vendor. */ -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a );mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_INT_CANCEL ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x03 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xA9 ,0x00 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x03 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0xa9 ,0x00 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5A ,0x09 );
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c static void mantix_init_sequence(struct mipi_dsi_multi_context *dsi_ctx) · line 66
Quoted 10 lines
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c +3
-2+mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x5a ,0x09 );mipi_dsi_generic_write_seq_multi (dsi_ctx,0x80 ,0x64 ,0x00 ,0x64 ,0x00 ,0x00 );mipi_dsi_msleep (dsi_ctx,20 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xA5 ); -mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2F ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_SPI_FINISH ,0xa5 ); +mipi_dsi_generic_write_seq_multi (dsi_ctx,MANTIX_CMD_OTP_STOP_RELOAD_MIPI ,0x00 ,0x2f );mipi_dsi_msleep (dsi_ctx,20 ); }
Cheers,
-- Guido
Quoted 4 lines
Signature · 2 lines
-- 2.46.0
Hi,
Quoted 3 lines · Tejas Vipin
Uses mipi_dsi_*_multi function in the mantix-mlaf057we51 panel and converting uppercase hex to lowercase hex for cleanup.
Thanks, Applied to https://gitlab.freedesktop.org/drm/misc/kernel.git (drm-misc-next)
[1/2] drm/panel: mantix-mlaf057we51: transition to mipi_dsi wrapped functions
https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/e139c0eb22ce5b2ab6a2056c1ff495f3a38322d7 [2/2] drm/panel: mantix-mlaf057we51: write hex in lowercase https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/b61c4bc674c6032827f2682a0c72ff577c36143f
Signature · 1 line
Neil