diff mbox series

[v3,2/2] drm/panel: startek-kd070fhfid015: transition to mipi_dsi wrapped functions

Message ID 20240806135949.468636-3-tejasvipin76@gmail.com (mailing list archive)
State New, archived
Headers show
Series add more multi functions to streamline error handling | expand

Commit Message

Tejas Vipin Aug. 6, 2024, 1:59 p.m. UTC 
Use multi style wrapped functions for mipi_dsi in the
startek-kd070fhfid015 panel.

Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com>
---
 .../drm/panel/panel-startek-kd070fhfid015.c   | 115 ++++++------------
 1 file changed, 35 insertions(+), 80 deletions(-)

Comments

Doug Anderson Aug. 7, 2024, 10:54 p.m. UTC | #1 
Hi,

On Tue, Aug 6, 2024 at 7:00 AM Tejas Vipin <tejasvipin76@gmail.com> wrote:
>
> Use multi style wrapped functions for mipi_dsi in the
> startek-kd070fhfid015 panel.
>
> Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com>
> ---
>  .../drm/panel/panel-startek-kd070fhfid015.c   | 115 ++++++------------
>  1 file changed, 35 insertions(+), 80 deletions(-)

Reviewed-by: Douglas Anderson <dianders@chromium.org>

If nobody else has any comments, I'll plan to apply this midway
through next week.
Jessica Zhang Aug. 8, 2024, 9:02 p.m. UTC | #2 
On 8/6/2024 6:59 AM, Tejas Vipin wrote:
> Use multi style wrapped functions for mipi_dsi in the
> startek-kd070fhfid015 panel.
> 
> Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com>

Reviewed-by: Jessica Zhang <quic_jesszhan@quicinc.com>

> ---
>   .../drm/panel/panel-startek-kd070fhfid015.c   | 115 ++++++------------
>   1 file changed, 35 insertions(+), 80 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c b/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
> index 0156689f41cd..c0c95355b743 100644
> --- a/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
> +++ b/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
> @@ -24,10 +24,10 @@
>   #include <drm/drm_modes.h>
>   #include <drm/drm_panel.h>
>   
> -#define DSI_REG_MCAP	0xB0
> -#define DSI_REG_IS	0xB3 /* Interface Setting */
> -#define DSI_REG_IIS	0xB4 /* Interface ID Setting */
> -#define DSI_REG_CTRL	0xB6
> +#define DSI_REG_MCAP	0xb0
> +#define DSI_REG_IS	0xb3 /* Interface Setting */
> +#define DSI_REG_IIS	0xb4 /* Interface ID Setting */
> +#define DSI_REG_CTRL	0xb6
>   
>   enum {
>   	IOVCC = 0,
> @@ -52,92 +52,55 @@ static inline struct stk_panel *to_stk_panel(struct drm_panel *panel)
>   static int stk_panel_init(struct stk_panel *stk)
>   {
>   	struct mipi_dsi_device *dsi = stk->dsi;
> -	struct device *dev = &stk->dsi->dev;
> -	int ret;
> -
> -	ret = mipi_dsi_dcs_soft_reset(dsi);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to mipi_dsi_dcs_soft_reset: %d\n", ret);
> -		return ret;
> -	}
> -	mdelay(5);
> +	struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
>   
> -	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to set exit sleep mode: %d\n", ret);
> -		return ret;
> -	}
> -	msleep(120);
> +	mipi_dsi_dcs_soft_reset_multi(&dsi_ctx);
> +	mipi_dsi_msleep(&dsi_ctx, 5);
> +	mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);
> +	mipi_dsi_msleep(&dsi_ctx, 120);
>   
> -	mipi_dsi_generic_write_seq(dsi, DSI_REG_MCAP, 0x04);
> +	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_MCAP, 0x04);
>   
>   	/* Interface setting, video mode */
> -	mipi_dsi_generic_write_seq(dsi, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00);
> -	mipi_dsi_generic_write_seq(dsi, DSI_REG_IIS, 0x0C, 0x00);
> -	mipi_dsi_generic_write_seq(dsi, DSI_REG_CTRL, 0x3A, 0xD3);
> +	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00);
> +	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IIS, 0x0c, 0x00);
> +	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_CTRL, 0x3a, 0xd3);
>   
> -	ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x77);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to write display brightness: %d\n", ret);
> -		return ret;
> -	}
> +	mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, 0x77);
>   
> -	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY,
> -			       MIPI_DCS_WRITE_MEMORY_START);
> +	mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_CONTROL_DISPLAY,
> +				     MIPI_DCS_WRITE_MEMORY_START);
>   
> -	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_set_pixel_format_multi(&dsi_ctx, 0x77);
> +	mipi_dsi_dcs_set_column_address_multi(&dsi_ctx, 0, stk->mode->hdisplay - 1);
> +	mipi_dsi_dcs_set_page_address_multi(&dsi_ctx, 0, stk->mode->vdisplay - 1);
>   
> -	ret = mipi_dsi_dcs_set_column_address(dsi, 0, stk->mode->hdisplay - 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, 0, stk->mode->vdisplay - 1);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to set page address: %d\n", ret);
> -		return ret;
> -	}
> -
> -	return 0;
> +	return dsi_ctx.accum_err;
>   }
>   
>   static int stk_panel_on(struct stk_panel *stk)
>   {
>   	struct mipi_dsi_device *dsi = stk->dsi;
> -	struct device *dev = &stk->dsi->dev;
> -	int ret;
> +	struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
>   
> -	ret = mipi_dsi_dcs_set_display_on(dsi);
> -	if (ret < 0)
> -		dev_err(dev, "failed to set display on: %d\n", ret);
> +	mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);
>   
> -	mdelay(20);
> +	mipi_dsi_msleep(&dsi_ctx, 20);
>   
> -	return ret;
> +	return dsi_ctx.accum_err;
>   }
>   
>   static void stk_panel_off(struct stk_panel *stk)
>   {
>   	struct mipi_dsi_device *dsi = stk->dsi;
> -	struct device *dev = &stk->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);
> +	mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);
> +	mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);
>   
> -	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
> -	if (ret < 0)
> -		dev_err(dev, "failed to enter sleep mode: %d\n", ret);
> -
> -	msleep(100);
> +	mipi_dsi_msleep(&dsi_ctx, 100);
>   }
>   
>   static int stk_panel_unprepare(struct drm_panel *panel)
> @@ -155,7 +118,6 @@ static int stk_panel_unprepare(struct drm_panel *panel)
>   static int stk_panel_prepare(struct drm_panel *panel)
>   {
>   	struct stk_panel *stk = to_stk_panel(panel);
> -	struct device *dev = &stk->dsi->dev;
>   	int ret;
>   
>   	gpiod_set_value(stk->reset_gpio, 0);
> @@ -175,16 +137,12 @@ static int stk_panel_prepare(struct drm_panel *panel)
>   	gpiod_set_value(stk->reset_gpio, 1);
>   	mdelay(10);
>   	ret = stk_panel_init(stk);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to init panel: %d\n", ret);
> +	if (ret < 0)
>   		goto poweroff;
> -	}
>   
>   	ret = stk_panel_on(stk);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to set panel on: %d\n", ret);
> +	if (ret < 0)
>   		goto poweroff;
> -	}
>   
>   	return 0;
>   
> @@ -250,18 +208,15 @@ static int dsi_dcs_bl_get_brightness(struct backlight_device *bl)
>   static int dsi_dcs_bl_update_status(struct backlight_device *bl)
>   {
>   	struct mipi_dsi_device *dsi = bl_get_data(bl);
> -	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_brightness(dsi, bl->props.brightness);
> -	if (ret < 0) {
> -		dev_err(dev, "failed to set DSI control: %d\n", ret);
> -		return ret;
> -	}
> +	mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, bl->props.brightness);
> +	if (dsi_ctx.accum_err)
> +		return dsi_ctx.accum_err;
>   
>   	dsi->mode_flags |= MIPI_DSI_MODE_LPM;
> -	return 0;
> +	return dsi_ctx.accum_err;
>   }
>   
>   static const struct backlight_ops dsi_bl_ops = {
> -- 
> 2.46.0
>
Doug Anderson Aug. 13, 2024, 6:16 p.m. UTC | #3 
Hi,

On Tue, Aug 6, 2024 at 7:00 AM Tejas Vipin <tejasvipin76@gmail.com> wrote:
>
> Use multi style wrapped functions for mipi_dsi in the
> startek-kd070fhfid015 panel.
>
> Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com>
> ---
>  .../drm/panel/panel-startek-kd070fhfid015.c   | 115 ++++++------------
>  1 file changed, 35 insertions(+), 80 deletions(-)

Pushed to drm-misc-next:

[2/2] drm/panel: startek-kd070fhfid015: transition to mipi_dsi wrapped functions
      commit: b080a60731ad909eae4463684acc23d322e93579
diff mbox series

Patch

diff --git a/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c b/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
index 0156689f41cd..c0c95355b743 100644
--- a/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
+++ b/drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
@@ -24,10 +24,10 @@ 
 #include <drm/drm_modes.h>
 #include <drm/drm_panel.h>
 
-#define DSI_REG_MCAP	0xB0
-#define DSI_REG_IS	0xB3 /* Interface Setting */
-#define DSI_REG_IIS	0xB4 /* Interface ID Setting */
-#define DSI_REG_CTRL	0xB6
+#define DSI_REG_MCAP	0xb0
+#define DSI_REG_IS	0xb3 /* Interface Setting */
+#define DSI_REG_IIS	0xb4 /* Interface ID Setting */
+#define DSI_REG_CTRL	0xb6
 
 enum {
 	IOVCC = 0,
@@ -52,92 +52,55 @@  static inline struct stk_panel *to_stk_panel(struct drm_panel *panel)
 static int stk_panel_init(struct stk_panel *stk)
 {
 	struct mipi_dsi_device *dsi = stk->dsi;
-	struct device *dev = &stk->dsi->dev;
-	int ret;
-
-	ret = mipi_dsi_dcs_soft_reset(dsi);
-	if (ret < 0) {
-		dev_err(dev, "failed to mipi_dsi_dcs_soft_reset: %d\n", ret);
-		return ret;
-	}
-	mdelay(5);
+	struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
 
-	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
-	if (ret < 0) {
-		dev_err(dev, "failed to set exit sleep mode: %d\n", ret);
-		return ret;
-	}
-	msleep(120);
+	mipi_dsi_dcs_soft_reset_multi(&dsi_ctx);
+	mipi_dsi_msleep(&dsi_ctx, 5);
+	mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);
+	mipi_dsi_msleep(&dsi_ctx, 120);
 
-	mipi_dsi_generic_write_seq(dsi, DSI_REG_MCAP, 0x04);
+	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_MCAP, 0x04);
 
 	/* Interface setting, video mode */
-	mipi_dsi_generic_write_seq(dsi, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00);
-	mipi_dsi_generic_write_seq(dsi, DSI_REG_IIS, 0x0C, 0x00);
-	mipi_dsi_generic_write_seq(dsi, DSI_REG_CTRL, 0x3A, 0xD3);
+	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00);
+	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IIS, 0x0c, 0x00);
+	mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_CTRL, 0x3a, 0xd3);
 
-	ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x77);
-	if (ret < 0) {
-		dev_err(dev, "failed to write display brightness: %d\n", ret);
-		return ret;
-	}
+	mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, 0x77);
 
-	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY,
-			       MIPI_DCS_WRITE_MEMORY_START);
+	mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_CONTROL_DISPLAY,
+				     MIPI_DCS_WRITE_MEMORY_START);
 
-	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_set_pixel_format_multi(&dsi_ctx, 0x77);
+	mipi_dsi_dcs_set_column_address_multi(&dsi_ctx, 0, stk->mode->hdisplay - 1);
+	mipi_dsi_dcs_set_page_address_multi(&dsi_ctx, 0, stk->mode->vdisplay - 1);
 
-	ret = mipi_dsi_dcs_set_column_address(dsi, 0, stk->mode->hdisplay - 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, 0, stk->mode->vdisplay - 1);
-	if (ret < 0) {
-		dev_err(dev, "failed to set page address: %d\n", ret);
-		return ret;
-	}
-
-	return 0;
+	return dsi_ctx.accum_err;
 }
 
 static int stk_panel_on(struct stk_panel *stk)
 {
 	struct mipi_dsi_device *dsi = stk->dsi;
-	struct device *dev = &stk->dsi->dev;
-	int ret;
+	struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
 
-	ret = mipi_dsi_dcs_set_display_on(dsi);
-	if (ret < 0)
-		dev_err(dev, "failed to set display on: %d\n", ret);
+	mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);
 
-	mdelay(20);
+	mipi_dsi_msleep(&dsi_ctx, 20);
 
-	return ret;
+	return dsi_ctx.accum_err;
 }
 
 static void stk_panel_off(struct stk_panel *stk)
 {
 	struct mipi_dsi_device *dsi = stk->dsi;
-	struct device *dev = &stk->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);
+	mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);
+	mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);
 
-	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
-	if (ret < 0)
-		dev_err(dev, "failed to enter sleep mode: %d\n", ret);
-
-	msleep(100);
+	mipi_dsi_msleep(&dsi_ctx, 100);
 }
 
 static int stk_panel_unprepare(struct drm_panel *panel)
@@ -155,7 +118,6 @@  static int stk_panel_unprepare(struct drm_panel *panel)
 static int stk_panel_prepare(struct drm_panel *panel)
 {
 	struct stk_panel *stk = to_stk_panel(panel);
-	struct device *dev = &stk->dsi->dev;
 	int ret;
 
 	gpiod_set_value(stk->reset_gpio, 0);
@@ -175,16 +137,12 @@  static int stk_panel_prepare(struct drm_panel *panel)
 	gpiod_set_value(stk->reset_gpio, 1);
 	mdelay(10);
 	ret = stk_panel_init(stk);
-	if (ret < 0) {
-		dev_err(dev, "failed to init panel: %d\n", ret);
+	if (ret < 0)
 		goto poweroff;
-	}
 
 	ret = stk_panel_on(stk);
-	if (ret < 0) {
-		dev_err(dev, "failed to set panel on: %d\n", ret);
+	if (ret < 0)
 		goto poweroff;
-	}
 
 	return 0;
 
@@ -250,18 +208,15 @@  static int dsi_dcs_bl_get_brightness(struct backlight_device *bl)
 static int dsi_dcs_bl_update_status(struct backlight_device *bl)
 {
 	struct mipi_dsi_device *dsi = bl_get_data(bl);
-	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_brightness(dsi, bl->props.brightness);
-	if (ret < 0) {
-		dev_err(dev, "failed to set DSI control: %d\n", ret);
-		return ret;
-	}
+	mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, bl->props.brightness);
+	if (dsi_ctx.accum_err)
+		return dsi_ctx.accum_err;
 
 	dsi->mode_flags |= MIPI_DSI_MODE_LPM;
-	return 0;
+	return dsi_ctx.accum_err;
 }
 
 static const struct backlight_ops dsi_bl_ops = {