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

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

Merge "msm: mdss: fix conditional check for panel LP configuration"

parents e1d2f8f8 63d6f37e

drivers/video/msm/mdss/mdss_dsi.c

+7 −2
Original line number Diff line number Diff line
@@ -1497,10 +1497,12 @@ static int mdss_dsi_unblank(struct mdss_panel_data *pdata) 
		mdss_dsi_clk_ctrl(sctrl, sctrl->dsi_clk_handle,

				  MDSS_DSI_ALL_CLKS, MDSS_DSI_CLK_ON);



	if (mdss_dsi_is_panel_on_lp(pdata)) {

	if (ctrl_pdata->ctrl_state & CTRL_STATE_PANEL_LP) {

		pr_debug("%s: dsi_unblank with panel always on\n", __func__);

		if (ctrl_pdata->low_power_config)

			ret = ctrl_pdata->low_power_config(pdata, false);

		if (!ret)

			ctrl_pdata->ctrl_state &= ~CTRL_STATE_PANEL_LP;

		goto error;

	}
@@ -1565,6 +1567,8 @@ static int mdss_dsi_blank(struct mdss_panel_data *pdata, int power_state) 
		pr_debug("%s: low power state requested\n", __func__);

		if (ctrl_pdata->low_power_config)

			ret = ctrl_pdata->low_power_config(pdata, true);

		if (!ret)

			ctrl_pdata->ctrl_state |= CTRL_STATE_PANEL_LP;

		goto error;

	}
@@ -1607,7 +1611,8 @@ static int mdss_dsi_blank(struct mdss_panel_data *pdata, int power_state) 
			}

			ATRACE_END("dsi_panel_off");

		}

		ctrl_pdata->ctrl_state &= ~CTRL_STATE_PANEL_INIT;

		ctrl_pdata->ctrl_state &= ~(CTRL_STATE_PANEL_INIT |

			CTRL_STATE_PANEL_LP);

	}



error:

drivers/video/msm/mdss/mdss_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ enum dsi_pm_type { 
#define CTRL_STATE_PANEL_INIT		BIT(0)

#define CTRL_STATE_MDP_ACTIVE		BIT(1)

#define CTRL_STATE_DSI_ACTIVE		BIT(2)

#define CTRL_STATE_PANEL_LP		BIT(3)



#define DSI_NON_BURST_SYNCH_PULSE	0

#define DSI_NON_BURST_SYNCH_EVENT	1

drivers/video/msm/mdss/mdss_panel.h

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ enum { 
	MDSS_PANEL_POWER_LP2,

};



enum {

	MDSS_PANEL_BLANK_BLANK = 0,

	MDSS_PANEL_BLANK_UNBLANK,

	MDSS_PANEL_BLANK_LOW_POWER,

};



enum {

	MODE_GPIO_NOT_VALID = 0,

	MODE_GPIO_HIGH,