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

Commit cb926619 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: enable debug logs during dsi state checks"

parents 8d7eb335 a4189deb

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

+15 −15
Original line number Diff line number Diff line
@@ -275,12 +275,12 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
	switch (op) {

	case DSI_CTRL_OP_POWER_STATE_CHANGE:

		if (state->power_state == op_state) {

			pr_debug("[%d] No change in state, pwr_state=%d\n",

			pr_err("[%d] No change in state, pwr_state=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if (state->power_state == DSI_CTRL_POWER_VREG_ON) {

			if (state->vid_engine_state == DSI_CTRL_ENGINE_ON) {

				pr_debug("[%d]State error: op=%d: %d\n",

				pr_err("[%d]State error: op=%d: %d\n",

				       dsi_ctrl->cell_index,

				       op_state,

				       state->vid_engine_state);
@@ -290,12 +290,12 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		break;

	case DSI_CTRL_OP_CMD_ENGINE:

		if (state->cmd_engine_state == op_state) {

			pr_debug("[%d] No change in state, cmd_state=%d\n",

			pr_err("[%d] No change in state, cmd_state=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if ((state->power_state != DSI_CTRL_POWER_VREG_ON) ||

			   (state->controller_state != DSI_CTRL_ENGINE_ON)) {

			pr_debug("[%d]State error: op=%d: %d, %d\n",

			pr_err("[%d]State error: op=%d: %d, %d\n",

			       dsi_ctrl->cell_index,

			       op,

			       state->power_state,
@@ -305,12 +305,12 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		break;

	case DSI_CTRL_OP_VID_ENGINE:

		if (state->vid_engine_state == op_state) {

			pr_debug("[%d] No change in state, cmd_state=%d\n",

			pr_err("[%d] No change in state, cmd_state=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if ((state->power_state != DSI_CTRL_POWER_VREG_ON) ||

			   (state->controller_state != DSI_CTRL_ENGINE_ON)) {

			pr_debug("[%d]State error: op=%d: %d, %d\n",

			pr_err("[%d]State error: op=%d: %d, %d\n",

			       dsi_ctrl->cell_index,

			       op,

			       state->power_state,
@@ -320,11 +320,11 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		break;

	case DSI_CTRL_OP_HOST_ENGINE:

		if (state->controller_state == op_state) {

			pr_debug("[%d] No change in state, ctrl_state=%d\n",

			pr_err("[%d] No change in state, ctrl_state=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if (state->power_state != DSI_CTRL_POWER_VREG_ON) {

			pr_debug("[%d]State error (link is off): op=%d:, %d\n",

			pr_err("[%d]State error (link is off): op=%d:, %d\n",

			       dsi_ctrl->cell_index,

			       op_state,

			       state->power_state);
@@ -332,7 +332,7 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		} else if ((op_state == DSI_CTRL_ENGINE_OFF) &&

			   ((state->cmd_engine_state != DSI_CTRL_ENGINE_OFF) ||

			    (state->vid_engine_state != DSI_CTRL_ENGINE_OFF))) {

			pr_debug("[%d]State error (eng on): op=%d: %d, %d\n",

			pr_err("[%d]State error (eng on): op=%d: %d, %d\n",

				  dsi_ctrl->cell_index,

				  op_state,

				  state->cmd_engine_state,
@@ -344,7 +344,7 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		if ((state->power_state != DSI_CTRL_POWER_VREG_ON) ||

		    (state->host_initialized != true) ||

		    (state->cmd_engine_state != DSI_CTRL_ENGINE_ON)) {

			pr_debug("[%d]State error: op=%d: %d, %d, %d\n",

			pr_err("[%d]State error: op=%d: %d, %d, %d\n",

			       dsi_ctrl->cell_index,

			       op,

			       state->power_state,
@@ -355,23 +355,23 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		break;

	case DSI_CTRL_OP_HOST_INIT:

		if (state->host_initialized == op_state) {

			pr_debug("[%d] No change in state, host_init=%d\n",

			pr_err("[%d] No change in state, host_init=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if (state->power_state != DSI_CTRL_POWER_VREG_ON) {

			pr_debug("[%d]State error: op=%d: %d\n",

			pr_err("[%d]State error: op=%d: %d\n",

			       dsi_ctrl->cell_index, op, state->power_state);

			rc = -EINVAL;

		}

		break;

	case DSI_CTRL_OP_TPG:

		if (state->tpg_enabled == op_state) {

			pr_debug("[%d] No change in state, tpg_enabled=%d\n",

			pr_err("[%d] No change in state, tpg_enabled=%d\n",

			       dsi_ctrl->cell_index, op_state);

			rc = -EINVAL;

		} else if ((state->power_state != DSI_CTRL_POWER_VREG_ON) ||

			   (state->controller_state != DSI_CTRL_ENGINE_ON)) {

			pr_debug("[%d]State error: op=%d: %d, %d\n",

			pr_err("[%d]State error: op=%d: %d, %d\n",

			       dsi_ctrl->cell_index,

			       op,

			       state->power_state,
@@ -381,7 +381,7 @@ static int dsi_ctrl_check_state(struct dsi_ctrl *dsi_ctrl, 
		break;

	case DSI_CTRL_OP_PHY_SW_RESET:

		if (state->power_state != DSI_CTRL_POWER_VREG_ON) {

			pr_debug("[%d]State error: op=%d: %d\n",

			pr_err("[%d]State error: op=%d: %d\n",

			       dsi_ctrl->cell_index, op, state->power_state);

			rc = -EINVAL;

		}