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

Commit 6ab42d60 authored by Vishnuvardhan Prodduturi's avatar Vishnuvardhan Prodduturi
Browse files

msm: mdss: fix conditional check for panel LP configuration 



Add change to correct the conditional check for entering the
panel in and out of LP configurations. Remove the unused enum
structure related to panel blank status.

Change-Id: Ic1140eafcc7cdd8d64c107bddc824eeca844462d
Signed-off-by: default avatarPadmanabhan Komanduru <pkomandu@codeaurora.org>
Signed-off-by: default avatarVishnuvardhan Prodduturi <vproddut@codeaurora.org>
parent eb973791

drivers/video/fbdev/msm/mdss_dsi.c

+7 −2
Original line number Diff line number Diff line
@@ -1559,10 +1559,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;

	}
@@ -1627,6 +1629,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;

	}
@@ -1669,7 +1673,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/fbdev/msm/mdss_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,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/fbdev/msm/mdss_panel.h

+0 −6
Original line number Diff line number Diff line
@@ -111,12 +111,6 @@ enum { 
	MDSS_PANEL_POWER_LCD_DISABLED,

};



enum {

	MDSS_PANEL_BLANK_BLANK = 0,

	MDSS_PANEL_BLANK_UNBLANK,

	MDSS_PANEL_BLANK_LOW_POWER,

};



enum {

	MDSS_PANEL_LOW_PERSIST_MODE_OFF = 0,

	MDSS_PANEL_LOW_PERSIST_MODE_ON,