diff mbox series

[v3,14/56] drm/omap: panel-dsi-cm: use DSI helpers

Message ID 20201105120333.947408-15-tomi.valkeinen@ti.com (mailing list archive)
State New, archived
Headers show
Series Convert DSI code to use drm_mipi_dsi and drm_panel | expand

Commit Message

Tomi Valkeinen Nov. 5, 2020, 12:02 p.m. UTC 
From: Sebastian Reichel <sebastian.reichel@collabora.com>

After converting the driver to mipi_dsi_device we can use the generic
message helpers to simplify the driver a lot.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 .../gpu/drm/omapdrm/displays/panel-dsi-cm.c   | 125 +++---------------
 1 file changed, 18 insertions(+), 107 deletions(-)

Comments

Laurent Pinchart Nov. 9, 2020, 8:40 a.m. UTC | #1 
Hi Tomi and Sebastian,

Thank you for the patch.

On Thu, Nov 05, 2020 at 02:02:51PM +0200, Tomi Valkeinen wrote:
> From: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> After converting the driver to mipi_dsi_device we can use the generic
> message helpers to simplify the driver a lot.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  .../gpu/drm/omapdrm/displays/panel-dsi-cm.c   | 125 +++---------------
>  1 file changed, 18 insertions(+), 107 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> index c3190223d192..ec36e62ddc3a 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> @@ -138,62 +138,22 @@ static void hw_guard_wait(struct panel_drv_data *ddata)
>  
>  static int dsicm_dcs_read_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 *data)
>  {
> -	struct mipi_dsi_device *dsi = ddata->dsi;
> -	const struct mipi_dsi_msg msg = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_DCS_READ,
> -		.tx_len = 1,
> -		.tx_buf = &dcs_cmd,
> -		.rx_len = 1,
> -		.rx_buf = data
> -	};
> -
> -	return dsi->host->ops->transfer(dsi->host, &msg);
> -}
> -
> -static int dsicm_dcs_write_0(struct panel_drv_data *ddata, u8 dcs_cmd)
> -{
> -	struct mipi_dsi_device *dsi = ddata->dsi;
> -	const struct mipi_dsi_msg msg = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_DCS_SHORT_WRITE,
> -		.tx_buf = &dcs_cmd,
> -		.tx_len = 1,
> -	};
> -
> -	return dsi->host->ops->transfer(dsi->host, &msg);
> +	return mipi_dsi_dcs_read(ddata->dsi, dcs_cmd, data, 1);
>  }
>  
>  static int dsicm_dcs_write_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 param)
>  {
> -	struct mipi_dsi_device *dsi = ddata->dsi;
> -	const u8 buf[] = { dcs_cmd, param };
> -	const struct mipi_dsi_msg msg = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_DCS_SHORT_WRITE_PARAM,
> -		.tx_buf = &buf,
> -		.tx_len = 2,
> -	};
> -
> -	return dsi->host->ops->transfer(dsi->host, &msg);
> +	return mipi_dsi_dcs_write(ddata->dsi, dcs_cmd, &param, 1);
>  }
>  
>  static int dsicm_sleep_in(struct panel_drv_data *ddata)
>  
>  {
> -	struct mipi_dsi_device *dsi = ddata->dsi;
>  	int r;
> -	const u8 cmd = MIPI_DCS_ENTER_SLEEP_MODE;
> -	const struct mipi_dsi_msg msg = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_DCS_SHORT_WRITE,
> -		.tx_buf = &cmd,
> -		.tx_len = 1,
> -	};
>  
>  	hw_guard_wait(ddata);
>  
> -	r = dsi->host->ops->transfer(dsi->host, &msg);
> +	r = mipi_dsi_dcs_enter_sleep_mode(ddata->dsi);
>  	if (r)
>  		return r;
>  
> @@ -210,7 +170,7 @@ static int dsicm_sleep_out(struct panel_drv_data *ddata)
>  
>  	hw_guard_wait(ddata);
>  
> -	r = dsicm_dcs_write_0(ddata, MIPI_DCS_EXIT_SLEEP_MODE);
> +	r = mipi_dsi_dcs_exit_sleep_mode(ddata->dsi);
>  	if (r)
>  		return r;
>  
> @@ -248,45 +208,15 @@ static int dsicm_set_update_window(struct panel_drv_data *ddata,
>  	u16 y1 = y;
>  	u16 y2 = y + h - 1;
>  
> -	const u8 paramX[] = {
> -		MIPI_DCS_SET_COLUMN_ADDRESS,
> -		(x1 >> 8) & 0xff,
> -		(x1 >> 0) & 0xff,
> -		(x2 >> 8) & 0xff,
> -		(x2 >> 0) & 0xff,
> -	};
> -
> -	const struct mipi_dsi_msg msgX = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_GENERIC_LONG_WRITE,
> -		.tx_buf = paramX,
> -		.tx_len = 5,
> -	};
> -
> -	const u8 paramY[] = {
> -		MIPI_DCS_SET_PAGE_ADDRESS,
> -		(y1 >> 8) & 0xff,
> -		(y1 >> 0) & 0xff,
> -		(y2 >> 8) & 0xff,
> -		(y2 >> 0) & 0xff,
> -	};
> -
> -	const struct mipi_dsi_msg msgY = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_GENERIC_LONG_WRITE,
> -		.tx_buf = paramY,
> -		.tx_len = 5,
> -	};
> -
> -	r = dsi->host->ops->transfer(dsi->host, &msgX);
> -	if (r)
> +	r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
> +	if (r < 0)
>  		return r;
>  
> -	r = dsi->host->ops->transfer(dsi->host, &msgY);
> -	if (r)
> +	r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
> +	if (r < 0)
>  		return r;
>  
> -	return r;
> +	return 0;
>  }
>  
>  static void dsicm_queue_ulps_work(struct panel_drv_data *ddata)
> @@ -680,12 +610,11 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
>  	if (r)
>  		goto err;
>  
> -	r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_PIXEL_FORMAT,
> -		MIPI_DCS_PIXEL_FMT_24BIT);
> +	r = mipi_dsi_dcs_set_pixel_format(ddata->dsi, MIPI_DCS_PIXEL_FMT_24BIT);
>  	if (r)
>  		goto err;
>  
> -	r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_ON);
> +	r = mipi_dsi_dcs_set_display_on(ddata->dsi);
>  	if (r)
>  		goto err;
>  
> @@ -731,7 +660,7 @@ static void dsicm_power_off(struct panel_drv_data *ddata)
>  
>  	src->ops->dsi.disable_video_output(src, ddata->channel);
>  
> -	r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_OFF);
> +	r = mipi_dsi_dcs_set_display_off(ddata->dsi);
>  	if (!r)
>  		r = dsicm_sleep_in(ddata);
>  
> @@ -949,12 +878,13 @@ static int dsicm_sync(struct omap_dss_device *dssdev)
>  static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
>  {
>  	struct omap_dss_device *src = ddata->src;
> +	struct mipi_dsi_device *dsi = ddata->dsi;
>  	int r;
>  
>  	if (enable)
> -		r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_TEAR_ON, 0);
> +		r = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
>  	else
> -		r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_TEAR_OFF);
> +		r = mipi_dsi_dcs_set_tear_off(dsi);
>  
>  	if (!ddata->ext_te_gpio)
>  		src->ops->dsi.enable_te(src, enable);
> @@ -1020,19 +950,7 @@ static int dsicm_set_max_rx_packet_size(struct omap_dss_device *dssdev,
>  	struct panel_drv_data *ddata = to_panel_data(dssdev);
>  	struct mipi_dsi_device *dsi = ddata->dsi;
>  
> -	const u8 buf[] = {
> -		size & 0xff,
> -		size >> 8 & 0xff,
> -	};
> -
> -	const struct mipi_dsi_msg msg = {
> -		.channel = ddata->channel,
> -		.type = MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE,
> -		.tx_buf = buf,
> -		.tx_len = 2,
> -	};
> -
> -	return dsi->host->ops->transfer(dsi->host, &msg);
> +	return mipi_dsi_set_maximum_return_packet_size(dsi, size);
>  }
>  
>  static int dsicm_memory_read(struct omap_dss_device *dssdev,
> @@ -1082,17 +1000,10 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
>  
>  	while (buf_used < size) {
>  		u8 dcs_cmd = first ? 0x2e : 0x3e;
> -		const struct mipi_dsi_msg msg = {
> -			.channel = ddata->channel,
> -			.type = MIPI_DSI_DCS_READ,
> -			.tx_buf = &dcs_cmd,
> -			.tx_len = 1,
> -			.rx_buf = buf + buf_used,
> -			.rx_len = size - buf_used,
> -		};
>  		first = 0;
>  
> -		r = dsi->host->ops->transfer(dsi->host, &msg);
> +		r = mipi_dsi_dcs_read(dsi, dcs_cmd,
> +				      buf + buf_used, size - buf_used);
>  		if (r < 0) {
>  			dev_err(dssdev->dev, "read error\n");
>  			goto err3;
diff mbox series

Patch

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index c3190223d192..ec36e62ddc3a 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -138,62 +138,22 @@  static void hw_guard_wait(struct panel_drv_data *ddata)
 
 static int dsicm_dcs_read_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 *data)
 {
-	struct mipi_dsi_device *dsi = ddata->dsi;
-	const struct mipi_dsi_msg msg = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_DCS_READ,
-		.tx_len = 1,
-		.tx_buf = &dcs_cmd,
-		.rx_len = 1,
-		.rx_buf = data
-	};
-
-	return dsi->host->ops->transfer(dsi->host, &msg);
-}
-
-static int dsicm_dcs_write_0(struct panel_drv_data *ddata, u8 dcs_cmd)
-{
-	struct mipi_dsi_device *dsi = ddata->dsi;
-	const struct mipi_dsi_msg msg = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_DCS_SHORT_WRITE,
-		.tx_buf = &dcs_cmd,
-		.tx_len = 1,
-	};
-
-	return dsi->host->ops->transfer(dsi->host, &msg);
+	return mipi_dsi_dcs_read(ddata->dsi, dcs_cmd, data, 1);
 }
 
 static int dsicm_dcs_write_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 param)
 {
-	struct mipi_dsi_device *dsi = ddata->dsi;
-	const u8 buf[] = { dcs_cmd, param };
-	const struct mipi_dsi_msg msg = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_DCS_SHORT_WRITE_PARAM,
-		.tx_buf = &buf,
-		.tx_len = 2,
-	};
-
-	return dsi->host->ops->transfer(dsi->host, &msg);
+	return mipi_dsi_dcs_write(ddata->dsi, dcs_cmd, &param, 1);
 }
 
 static int dsicm_sleep_in(struct panel_drv_data *ddata)
 
 {
-	struct mipi_dsi_device *dsi = ddata->dsi;
 	int r;
-	const u8 cmd = MIPI_DCS_ENTER_SLEEP_MODE;
-	const struct mipi_dsi_msg msg = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_DCS_SHORT_WRITE,
-		.tx_buf = &cmd,
-		.tx_len = 1,
-	};
 
 	hw_guard_wait(ddata);
 
-	r = dsi->host->ops->transfer(dsi->host, &msg);
+	r = mipi_dsi_dcs_enter_sleep_mode(ddata->dsi);
 	if (r)
 		return r;
 
@@ -210,7 +170,7 @@  static int dsicm_sleep_out(struct panel_drv_data *ddata)
 
 	hw_guard_wait(ddata);
 
-	r = dsicm_dcs_write_0(ddata, MIPI_DCS_EXIT_SLEEP_MODE);
+	r = mipi_dsi_dcs_exit_sleep_mode(ddata->dsi);
 	if (r)
 		return r;
 
@@ -248,45 +208,15 @@  static int dsicm_set_update_window(struct panel_drv_data *ddata,
 	u16 y1 = y;
 	u16 y2 = y + h - 1;
 
-	const u8 paramX[] = {
-		MIPI_DCS_SET_COLUMN_ADDRESS,
-		(x1 >> 8) & 0xff,
-		(x1 >> 0) & 0xff,
-		(x2 >> 8) & 0xff,
-		(x2 >> 0) & 0xff,
-	};
-
-	const struct mipi_dsi_msg msgX = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_GENERIC_LONG_WRITE,
-		.tx_buf = paramX,
-		.tx_len = 5,
-	};
-
-	const u8 paramY[] = {
-		MIPI_DCS_SET_PAGE_ADDRESS,
-		(y1 >> 8) & 0xff,
-		(y1 >> 0) & 0xff,
-		(y2 >> 8) & 0xff,
-		(y2 >> 0) & 0xff,
-	};
-
-	const struct mipi_dsi_msg msgY = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_GENERIC_LONG_WRITE,
-		.tx_buf = paramY,
-		.tx_len = 5,
-	};
-
-	r = dsi->host->ops->transfer(dsi->host, &msgX);
-	if (r)
+	r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
+	if (r < 0)
 		return r;
 
-	r = dsi->host->ops->transfer(dsi->host, &msgY);
-	if (r)
+	r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
+	if (r < 0)
 		return r;
 
-	return r;
+	return 0;
 }
 
 static void dsicm_queue_ulps_work(struct panel_drv_data *ddata)
@@ -680,12 +610,11 @@  static int dsicm_power_on(struct panel_drv_data *ddata)
 	if (r)
 		goto err;
 
-	r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_PIXEL_FORMAT,
-		MIPI_DCS_PIXEL_FMT_24BIT);
+	r = mipi_dsi_dcs_set_pixel_format(ddata->dsi, MIPI_DCS_PIXEL_FMT_24BIT);
 	if (r)
 		goto err;
 
-	r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_ON);
+	r = mipi_dsi_dcs_set_display_on(ddata->dsi);
 	if (r)
 		goto err;
 
@@ -731,7 +660,7 @@  static void dsicm_power_off(struct panel_drv_data *ddata)
 
 	src->ops->dsi.disable_video_output(src, ddata->channel);
 
-	r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_OFF);
+	r = mipi_dsi_dcs_set_display_off(ddata->dsi);
 	if (!r)
 		r = dsicm_sleep_in(ddata);
 
@@ -949,12 +878,13 @@  static int dsicm_sync(struct omap_dss_device *dssdev)
 static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
 {
 	struct omap_dss_device *src = ddata->src;
+	struct mipi_dsi_device *dsi = ddata->dsi;
 	int r;
 
 	if (enable)
-		r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_TEAR_ON, 0);
+		r = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
 	else
-		r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_TEAR_OFF);
+		r = mipi_dsi_dcs_set_tear_off(dsi);
 
 	if (!ddata->ext_te_gpio)
 		src->ops->dsi.enable_te(src, enable);
@@ -1020,19 +950,7 @@  static int dsicm_set_max_rx_packet_size(struct omap_dss_device *dssdev,
 	struct panel_drv_data *ddata = to_panel_data(dssdev);
 	struct mipi_dsi_device *dsi = ddata->dsi;
 
-	const u8 buf[] = {
-		size & 0xff,
-		size >> 8 & 0xff,
-	};
-
-	const struct mipi_dsi_msg msg = {
-		.channel = ddata->channel,
-		.type = MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE,
-		.tx_buf = buf,
-		.tx_len = 2,
-	};
-
-	return dsi->host->ops->transfer(dsi->host, &msg);
+	return mipi_dsi_set_maximum_return_packet_size(dsi, size);
 }
 
 static int dsicm_memory_read(struct omap_dss_device *dssdev,
@@ -1082,17 +1000,10 @@  static int dsicm_memory_read(struct omap_dss_device *dssdev,
 
 	while (buf_used < size) {
 		u8 dcs_cmd = first ? 0x2e : 0x3e;
-		const struct mipi_dsi_msg msg = {
-			.channel = ddata->channel,
-			.type = MIPI_DSI_DCS_READ,
-			.tx_buf = &dcs_cmd,
-			.tx_len = 1,
-			.rx_buf = buf + buf_used,
-			.rx_len = size - buf_used,
-		};
 		first = 0;
 
-		r = dsi->host->ops->transfer(dsi->host, &msg);
+		r = mipi_dsi_dcs_read(dsi, dcs_cmd,
+				      buf + buf_used, size - buf_used);
 		if (r < 0) {
 			dev_err(dssdev->dev, "read error\n");
 			goto err3;