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

Commit b7ae0124 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: Disable ESD thread during display shutdown"

parents 9ab7fa9e 0e5b0aa9

drivers/video/msm/mdss/mdss_dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -2665,6 +2665,7 @@ static int mdss_dsi_event_handler(struct mdss_panel_data *pdata, 
		break;

	case MDSS_EVENT_PANEL_OFF:

		power_state = (int) (unsigned long) arg;

		disable_esd_thread();

		ctrl_pdata->ctrl_state &= ~CTRL_STATE_MDP_ACTIVE;

		if (ctrl_pdata->off_cmds.link_state == DSI_LP_MODE)

			rc = mdss_dsi_blank(pdata, power_state);

drivers/video/msm/mdss/mdss_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ int mdss_dsi_wait_for_lane_idle(struct mdss_dsi_ctrl_pdata *ctrl); 


irqreturn_t mdss_dsi_isr(int irq, void *ptr);

irqreturn_t hw_vsync_handler(int irq, void *data);

void disable_esd_thread(void);

void mdss_dsi_irq_handler_config(struct mdss_dsi_ctrl_pdata *ctrl_pdata);



void mdss_dsi_set_tx_power_mode(int mode, struct mdss_panel_data *pdata);

drivers/video/msm/mdss/mdss_dsi_status.c

+10 −0
Original line number Diff line number Diff line
@@ -103,6 +103,16 @@ irqreturn_t hw_vsync_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



/*

 * disable_esd_thread() - Cancels work item for the esd check.

 */

void disable_esd_thread(void)

{

	if (pstatus_data &&

		cancel_delayed_work_sync(&pstatus_data->check_status))

			pr_debug("esd thread killed\n");

}



/*

 * fb_event_callback() - Call back function for the fb_register_client()

 *			 notifying events