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

Commit 1347825b 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: dsi: propagate error on read command failures"

parents 25606e2f cfc689ab

drivers/video/msm/mdss/mdss_dsi.h

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl, bool print_en); 
void mdss_dsi_lp_cd_rx(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_get_hw_revision(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_read_phy_revision(struct mdss_dsi_ctrl_pdata *ctrl);

u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,

int mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,

		char cmd1, void (*fxn)(int), char *rbuf, int len);

int mdss_dsi_panel_init(struct device_node *node,

		struct mdss_dsi_ctrl_pdata *ctrl_pdata,

drivers/video/msm/mdss/mdss_dsi_panel.c

+2 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct dsi_cmd_desc dcs_read_cmd = { 
	dcs_cmd

};



u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,

int mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,

		char cmd1, void (*fxn)(int), char *rbuf, int len)

{

	struct dcs_cmd_req cmdreq;
@@ -153,12 +153,11 @@ u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, 
	cmdreq.rlen = len;

	cmdreq.rbuf = rbuf;

	cmdreq.cb = fxn; /* call back */

	mdss_dsi_cmdlist_put(ctrl, &cmdreq);

	/*

	 * blocked here, until call back called

	 */



	return 0;

	return mdss_dsi_cmdlist_put(ctrl, &cmdreq);

}



static void mdss_dsi_panel_cmds_send(struct mdss_dsi_ctrl_pdata *ctrl,