Commit e7096538 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Tomi Valkeinen
Browse files

drm/omap: dsi: simplify write function 



Simplify the write related messages handling by using the functionality
provided by CONFIG_DRM_MIPI_DSI.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-10-tomi.valkeinen@ti.com
parent 28d72874

drivers/gpu/drm/omapdrm/dss/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ config OMAP2_DSS_SDI 
config OMAP2_DSS_DSI

	bool "DSI support"

	default n

	select DRM_MIPI_DSI

	help

	  MIPI DSI (Display Serial Interface) support.

drivers/gpu/drm/omapdrm/dss/dsi.c

+33 −113
Original line number Diff line number Diff line
@@ -2698,97 +2698,50 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int channel) 
	return dsi_vc_send_long(dsi, channel, MIPI_DSI_NULL_PACKET, NULL, 0, 0);

}



static int dsi_vc_write_nosync_common(struct dsi_data *dsi, int channel,

				      const u8 *data, int len,

				      enum dss_dsi_content_type type)

static int dsi_vc_write_common(struct omap_dss_device *dssdev,

			       const struct mipi_dsi_msg *msg)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);

	struct mipi_dsi_packet packet;

	int r;



	if (len == 0) {

		BUG_ON(type == DSS_DSI_CONTENT_DCS);

		r = dsi_vc_send_short(dsi, channel,

				MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM, 0, 0);

	} else if (len == 1) {

		r = dsi_vc_send_short(dsi, channel,

				type == DSS_DSI_CONTENT_GENERIC ?

				MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM :

				MIPI_DSI_DCS_SHORT_WRITE, data[0], 0);

	} else if (len == 2) {

		r = dsi_vc_send_short(dsi, channel,

				type == DSS_DSI_CONTENT_GENERIC ?

				MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM :

				MIPI_DSI_DCS_SHORT_WRITE_PARAM,

				data[0] | (data[1] << 8), 0);

	} else {

		r = dsi_vc_send_long(dsi, channel,

				type == DSS_DSI_CONTENT_GENERIC ?

				MIPI_DSI_GENERIC_LONG_WRITE :

				MIPI_DSI_DCS_LONG_WRITE, data, len, 0);

	}



	r = mipi_dsi_create_packet(&packet, msg);

	if (r < 0)

		return r;

}



static int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

		const u8 *data, int len)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);



	return dsi_vc_write_nosync_common(dsi, channel, data, len,

			DSS_DSI_CONTENT_DCS);

}



static int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

		const u8 *data, int len)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);

	if (mipi_dsi_packet_format_is_short(msg->type)) {

		u16 data = packet.header[1] | (packet.header[2] << 8);



	return dsi_vc_write_nosync_common(dsi, channel, data, len,

			DSS_DSI_CONTENT_GENERIC);

		r = dsi_vc_send_short(dsi, msg->channel, msg->type, data, 0);

	} else {

		r = dsi_vc_send_long(dsi, msg->channel, msg->type,

				     msg->tx_buf, msg->tx_len, 0);

	}



static int dsi_vc_write_common(struct omap_dss_device *dssdev,

			       int channel, const u8 *data, int len,

			       enum dss_dsi_content_type type)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);

	int r;

	if (r < 0)

		return r;



	r = dsi_vc_write_nosync_common(dsi, channel, data, len, type);

	if (r)

		goto err;

	/*

	 * TODO: we do not always have to do the BTA sync, for example

	 * we can improve performance by setting the update window

	 * information without sending BTA sync between the commands.

	 * In that case we can return early.

	 */



	r = dsi_vc_send_bta_sync(dssdev, channel);

	if (r)

		goto err;

	r = dsi_vc_send_bta_sync(dssdev, msg->channel);

	if (r) {

		DSSERR("bta sync failed\n");

		return r;

	}



	/* RX_FIFO_NOT_EMPTY */

	if (REG_GET(dsi, DSI_VC_CTRL(channel), 20, 20)) {

	if (REG_GET(dsi, DSI_VC_CTRL(msg->channel), 20, 20)) {

		DSSERR("rx fifo not empty after write, dumping data:\n");

		dsi_vc_flush_receive_data(dsi, channel);

		r = -EIO;

		goto err;

		dsi_vc_flush_receive_data(dsi, msg->channel);

		return -EIO;

	}



	return 0;

err:

	DSSERR("dsi_vc_write_common(ch %d, cmd 0x%02x, len %d) failed\n",

			channel, data[0], len);

	return r;

}



static int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel,

		const u8 *data, int len)

{

	return dsi_vc_write_common(dssdev, channel, data, len,

			DSS_DSI_CONTENT_DCS);

}



static int dsi_vc_generic_write(struct omap_dss_device *dssdev, int channel,

		const u8 *data, int len)

{

	return dsi_vc_write_common(dssdev, channel, data, len,

			DSS_DSI_CONTENT_GENERIC);

}



static int dsi_vc_dcs_send_read_request(struct dsi_data *dsi, int channel,
@@ -3010,15 +2963,6 @@ static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel, 
	return 0;

}



static int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel,

		u16 len)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);



	return dsi_vc_send_short(dsi, channel,

			MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, len, 0);

}



static int dsi_enter_ulps(struct dsi_data *dsi)

{

	DECLARE_COMPLETION_ONSTACK(completion);
@@ -4815,36 +4759,17 @@ static void dsi_release_vc(struct omap_dss_device *dssdev, int channel) 
static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev,

				 const struct mipi_dsi_msg *msg)

{

	/*

	 * TODO: no_sync can be used to optimize performance by sending e.g.

	 * column and page information without syncing in between. It's not

	 * absolutely required, so postpone this feature for now.

	 */

	bool no_sync = false;

	u16 val;



	switch (msg->type) {

	case MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM:

	case MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM:

	case MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM:

	case MIPI_DSI_GENERIC_LONG_WRITE:

		if (no_sync)

			return dsi_vc_generic_write_nosync(dssdev, msg->channel,

							   msg->tx_buf,

							   msg->tx_len);

		else

			return dsi_vc_generic_write(dssdev, msg->channel,

						    msg->tx_buf, msg->tx_len);

	case MIPI_DSI_DCS_SHORT_WRITE:

	case MIPI_DSI_DCS_SHORT_WRITE_PARAM:

	case MIPI_DSI_DCS_LONG_WRITE:

		if (no_sync)

			return dsi_vc_dcs_write_nosync(dssdev, msg->channel,

						       msg->tx_buf,

						       msg->tx_len);

		else

			return dsi_vc_dcs_write(dssdev, msg->channel,

						msg->tx_buf, msg->tx_len);

	case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE:

	case MIPI_DSI_NULL_PACKET:

		return dsi_vc_write_common(dssdev, msg);

	case MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM:

	case MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM:

	case MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM:
@@ -4855,11 +4780,6 @@ static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev, 
		return dsi_vc_dcs_read(dssdev, msg->channel,

				       ((u8 *)msg->tx_buf)[0],

				       msg->rx_buf, msg->rx_len);

	case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE:

		val = le16_to_cpu(*((__le16 *)msg->tx_buf));

		return dsi_vc_set_max_rx_packet_size(dssdev, msg->channel, val);

	case MIPI_DSI_NULL_PACKET:

		return dsi_vc_send_null(to_dsi_data(dssdev), msg->channel);

	}



	return -EINVAL;