Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffbf2423 authored by Satya Rama Aditya Pinapala's avatar Satya Rama Aditya Pinapala
Browse files

drm/msm/dsi-staging: Reduce complexity in code 



To increse readibilty, functions of larger length are refactored
based on different logic checks in the function. This change doesn't
change any functionality but only improves code readability.

Change-Id: Id9525e2f24d556b38b5ac66a385d8a05b5bc4401
Signed-off-by: default avatarSatya Rama Aditya Pinapala <psraditya30@codeaurora.org>
parent 9310db7c

drivers/gpu/drm/msm/dsi-staging/dsi_clk_manager.c

+40 −28
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/of.h>
@@ -837,24 +837,11 @@ static int dsi_clk_update_link_clk_state(struct dsi_clk_mngr *mngr, 
	return rc;

}



static int dsi_update_clk_state(struct dsi_clk_mngr *mngr,

	struct dsi_core_clks *c_clks, u32 c_state,

	struct dsi_link_clks *l_clks, u32 l_state)

static int dsi_update_core_clks(struct dsi_clk_mngr *mngr,

		struct dsi_core_clks *c_clks)

{

	int rc = 0;

	bool l_c_on = false;



	if (!mngr)

		return -EINVAL;



	pr_debug("c_state = %d, l_state = %d\n",

		 c_clks ? c_state : -1, l_clks ? l_state : -1);

	/*

	 * Below is the sequence to toggle DSI clocks:

	 *	1. For ON sequence, Core clocks before link clocks

	 *	2. For OFF sequence, Link clocks before core clocks.

	 */

	if (c_clks && (c_state == DSI_CLK_ON)) {

	if (mngr->core_clk_state == DSI_CLK_OFF) {

		rc = mngr->pre_clkon_cb(mngr->priv_data,

					DSI_CORE_CLK,
@@ -881,8 +868,33 @@ static int dsi_update_clk_state(struct dsi_clk_mngr *mngr, 
			pr_err("post clk on cb failed, rc = %d\n", rc);

	}

	mngr->core_clk_state = DSI_CLK_ON;

error:

	return rc;

}



static int dsi_update_clk_state(struct dsi_clk_mngr *mngr,

	struct dsi_core_clks *c_clks, u32 c_state,

	struct dsi_link_clks *l_clks, u32 l_state)

{

	int rc = 0;

	bool l_c_on = false;



	if (!mngr)

		return -EINVAL;



	pr_debug("c_state = %d, l_state = %d\n",

		 c_clks ? c_state : -1, l_clks ? l_state : -1);

	/*

	 * Below is the sequence to toggle DSI clocks:

	 *	1. For ON sequence, Core clocks before link clocks

	 *	2. For OFF sequence, Link clocks before core clocks.

	 */

	if (c_clks && (c_state == DSI_CLK_ON))

		rc = dsi_update_core_clks(mngr, c_clks);



	if (rc)

		goto error;



	if (l_clks) {

		if (l_state == DSI_CLK_ON) {

			rc = dsi_clk_update_link_clk_state(mngr, l_clks,

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+114 −102
Original line number Diff line number Diff line
@@ -1100,108 +1100,18 @@ int dsi_message_validate_tx_mode(struct dsi_ctrl *dsi_ctrl, 
	return rc;

}



static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,

static void dsi_kickoff_msg_tx(struct dsi_ctrl *dsi_ctrl,

				const struct mipi_dsi_msg *msg,

				struct dsi_ctrl_cmd_dma_fifo_info *cmd,

				struct dsi_ctrl_cmd_dma_info *cmd_mem,

				u32 flags)

{

	int rc = 0, ret = 0;

	struct mipi_dsi_packet packet;

	struct dsi_ctrl_cmd_dma_fifo_info cmd;

	struct dsi_ctrl_cmd_dma_info cmd_mem;

	u32 hw_flags = 0;

	u32 length = 0;

	u8 *buffer = NULL;

	u32 cnt = 0, line_no = 0x1;

	u8 *cmdbuf;

	u32 line_no = 0x1;

	struct dsi_mode_info *timing;

	struct dsi_ctrl_hw_ops dsi_hw_ops = dsi_ctrl->hw.ops;



	/* Select the tx mode to transfer the command */

	dsi_message_setup_tx_mode(dsi_ctrl, msg->tx_len, &flags);



	/* Validate the mode before sending the command */

	rc = dsi_message_validate_tx_mode(dsi_ctrl, msg->tx_len, &flags);

	if (rc) {

		pr_err(" Cmd tx validation failed, cannot transfer cmd\n");

		rc = -ENOTSUPP;

		goto error;

	}



	if (flags & DSI_CTRL_CMD_NON_EMBEDDED_MODE) {

		cmd_mem.offset = dsi_ctrl->cmd_buffer_iova;

		cmd_mem.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

			true : false;

		cmd_mem.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

			true : false;

		cmd_mem.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

			true : false;

		cmd_mem.datatype = msg->type;

		cmd_mem.length = msg->tx_len;



		dsi_ctrl->cmd_len = msg->tx_len;

		memcpy(dsi_ctrl->vaddr, msg->tx_buf, msg->tx_len);

		pr_debug(" non-embedded mode , size of command =%zd\n",

					msg->tx_len);



		goto kickoff;

	}



	rc = mipi_dsi_create_packet(&packet, msg);

	if (rc) {

		pr_err("Failed to create message packet, rc=%d\n", rc);

		goto error;

	}



	rc = dsi_ctrl_copy_and_pad_cmd(dsi_ctrl,

			&packet,

			&buffer,

			&length);

	if (rc) {

		pr_err("[%s] failed to copy message, rc=%d\n",

				dsi_ctrl->name, rc);

		goto error;

	}



	if ((msg->flags & MIPI_DSI_MSG_LASTCOMMAND))

		buffer[3] |= BIT(7);//set the last cmd bit in header.



	if (flags & DSI_CTRL_CMD_FETCH_MEMORY) {

		/* Embedded mode config is selected */

		cmd_mem.offset = dsi_ctrl->cmd_buffer_iova;

		cmd_mem.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

			true : false;

		cmd_mem.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

			true : false;

		cmd_mem.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

			true : false;



		cmdbuf = (u8 *)(dsi_ctrl->vaddr);



		msm_gem_sync(dsi_ctrl->tx_cmd_buf);

		for (cnt = 0; cnt < length; cnt++)

			cmdbuf[dsi_ctrl->cmd_len + cnt] = buffer[cnt];



		dsi_ctrl->cmd_len += length;



		if (!(msg->flags & MIPI_DSI_MSG_LASTCOMMAND)) {

			goto error;

		} else {

			cmd_mem.length = dsi_ctrl->cmd_len;

			dsi_ctrl->cmd_len = 0;

		}



	} else if (flags & DSI_CTRL_CMD_FIFO_STORE) {

		cmd.command =  (u32 *)buffer;

		cmd.size = length;

		cmd.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

				     true : false;

		cmd.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

				  true : false;

		cmd.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

				  true : false;

	}



kickoff:

	/* check if custom dma scheduling line needed */

	if ((dsi_ctrl->host_config.panel_mode == DSI_OP_VIDEO_MODE) &&

		(flags & DSI_CTRL_CMD_CUSTOM_DMA_SCHED))
@@ -1229,17 +1139,17 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl, 
			if (flags & DSI_CTRL_CMD_NON_EMBEDDED_MODE) {

				dsi_hw_ops.kickoff_command_non_embedded_mode(

							&dsi_ctrl->hw,

							&cmd_mem,

							cmd_mem,

							hw_flags);

			} else {

				dsi_hw_ops.kickoff_command(

						&dsi_ctrl->hw,

						&cmd_mem,

						cmd_mem,

						hw_flags);

			}

		} else if (flags & DSI_CTRL_CMD_FIFO_STORE) {

			dsi_hw_ops.kickoff_fifo_command(&dsi_ctrl->hw,

							      &cmd,

							      cmd,

							      hw_flags);

		}

	}
@@ -1257,17 +1167,17 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl, 
			if (flags & DSI_CTRL_CMD_NON_EMBEDDED_MODE) {

				dsi_hw_ops.kickoff_command_non_embedded_mode(

							&dsi_ctrl->hw,

							&cmd_mem,

							cmd_mem,

							hw_flags);

			} else {

				dsi_hw_ops.kickoff_command(

						&dsi_ctrl->hw,

						&cmd_mem,

						cmd_mem,

						hw_flags);

			}

		} else if (flags & DSI_CTRL_CMD_FIFO_STORE) {

			dsi_hw_ops.kickoff_fifo_command(&dsi_ctrl->hw,

							      &cmd,

							      cmd,

							      hw_flags);

		}
@@ -1314,6 +1224,108 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl, 
			dsi_ctrl->cmd_len = 0;

		}

	}

}



static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,

			  const struct mipi_dsi_msg *msg,

			  u32 flags)

{

	int rc = 0;

	struct mipi_dsi_packet packet;

	struct dsi_ctrl_cmd_dma_fifo_info cmd;

	struct dsi_ctrl_cmd_dma_info cmd_mem;

	u32 length = 0;

	u8 *buffer = NULL;

	u32 cnt = 0;

	u8 *cmdbuf;



	/* Select the tx mode to transfer the command */

	dsi_message_setup_tx_mode(dsi_ctrl, msg->tx_len, &flags);



	/* Validate the mode before sending the command */

	rc = dsi_message_validate_tx_mode(dsi_ctrl, msg->tx_len, &flags);

	if (rc) {

		pr_err(" Cmd tx validation failed, cannot transfer cmd\n");

		rc = -ENOTSUPP;

		goto error;

	}



	if (flags & DSI_CTRL_CMD_NON_EMBEDDED_MODE) {

		cmd_mem.offset = dsi_ctrl->cmd_buffer_iova;

		cmd_mem.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

			true : false;

		cmd_mem.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

			true : false;

		cmd_mem.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

			true : false;

		cmd_mem.datatype = msg->type;

		cmd_mem.length = msg->tx_len;



		dsi_ctrl->cmd_len = msg->tx_len;

		memcpy(dsi_ctrl->vaddr, msg->tx_buf, msg->tx_len);

		pr_debug(" non-embedded mode , size of command =%zd\n",

					msg->tx_len);



		goto kickoff;

	}



	rc = mipi_dsi_create_packet(&packet, msg);

	if (rc) {

		pr_err("Failed to create message packet, rc=%d\n", rc);

		goto error;

	}



	rc = dsi_ctrl_copy_and_pad_cmd(dsi_ctrl,

			&packet,

			&buffer,

			&length);

	if (rc) {

		pr_err("[%s] failed to copy message, rc=%d\n",

				dsi_ctrl->name, rc);

		goto error;

	}



	if ((msg->flags & MIPI_DSI_MSG_LASTCOMMAND))

		buffer[3] |= BIT(7);//set the last cmd bit in header.



	if (flags & DSI_CTRL_CMD_FETCH_MEMORY) {

		/* Embedded mode config is selected */

		cmd_mem.offset = dsi_ctrl->cmd_buffer_iova;

		cmd_mem.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

			true : false;

		cmd_mem.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

			true : false;

		cmd_mem.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

			true : false;



		cmdbuf = (u8 *)(dsi_ctrl->vaddr);



		msm_gem_sync(dsi_ctrl->tx_cmd_buf);

		for (cnt = 0; cnt < length; cnt++)

			cmdbuf[dsi_ctrl->cmd_len + cnt] = buffer[cnt];



		dsi_ctrl->cmd_len += length;



		if (!(msg->flags & MIPI_DSI_MSG_LASTCOMMAND)) {

			goto error;

		} else {

			cmd_mem.length = dsi_ctrl->cmd_len;

			dsi_ctrl->cmd_len = 0;

		}



	} else if (flags & DSI_CTRL_CMD_FIFO_STORE) {

		cmd.command =  (u32 *)buffer;

		cmd.size = length;

		cmd.en_broadcast = (flags & DSI_CTRL_CMD_BROADCAST) ?

				     true : false;

		cmd.is_master = (flags & DSI_CTRL_CMD_BROADCAST_MASTER) ?

				  true : false;

		cmd.use_lpm = (msg->flags & MIPI_DSI_MSG_USE_LPM) ?

				  true : false;

	}



kickoff:

	dsi_kickoff_msg_tx(dsi_ctrl, msg, &cmd, &cmd_mem, flags);

error:

	if (buffer)

		devm_kfree(&dsi_ctrl->pdev->dev, buffer);