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

Commit fbe3f4e1 authored by Aravind Venkateswaran's avatar Aravind Venkateswaran
Browse files

msm: mdss: ensure correct dsi phy init sequence is called 



The DSI phy init sequence differs based on the hardware version and
the driver needs to execute the corresponding sequence appropriately.
Commit I0564216737cc6e98c1e8658862cf7af5dabd363c introduced a bug which
removes the hardware version check resulting in the incorrect phy
init sequence being called. Fix this by adding the required version
checks back in the driver.

Change-Id: Ia48f5dd7986920b9064b66c1de7c6abe10bcd365
Signed-off-by: default avatarAravind Venkateswaran <aravindh@codeaurora.org>
parent 95b6c25e

drivers/video/msm/mdss/mdss_dsi.c

+0 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,6 @@ int dsi_panel_device_register(struct device_node *pan_node, 
		mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 1);

		ctrl_pdata->ctrl_state |=

			(CTRL_STATE_PANEL_INIT | CTRL_STATE_MDP_ACTIVE);

		ctrl_pdata->ctrl_rev = MIPI_INP(ctrl_pdata->ctrl_base);

	} else {

		pinfo->panel_power_on = 0;

	}

drivers/video/msm/mdss/mdss_dsi.h

+0 −3
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ struct mdss_dsi_ctrl_pdata { 
	void (*switch_mode) (struct mdss_panel_data *pdata, int mode);

	struct mdss_panel_data panel_data;

	unsigned char *ctrl_base;

	u32 ctrl_rev;

	struct dss_io_data ctrl_io;

	struct dss_io_data mmss_misc_io;

	struct dss_io_data phy_io;
@@ -400,7 +399,6 @@ int mdss_dsi_enable_bus_clocks(struct mdss_dsi_ctrl_pdata *ctrl_pdata); 
void mdss_dsi_disable_bus_clocks(struct mdss_dsi_ctrl_pdata *ctrl_pdata);

int mdss_dsi_panel_reset(struct mdss_panel_data *pdata, int enable);

void mdss_dsi_phy_disable(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_phy_init(struct mdss_panel_data *pdata);

void mdss_dsi_phy_sw_reset(unsigned char *ctrl_base);

void mdss_dsi_cmd_test_pattern(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_video_test_pattern(struct mdss_dsi_ctrl_pdata *ctrl);
@@ -423,7 +421,6 @@ int mdss_dsi_panel_init(struct device_node *node, 
		bool cmd_cfg_cont_splash);

int mdss_panel_get_dst_fmt(u32 bpp, char mipi_mode, u32 pixel_packing,

				char *dst_format);

void mdss_dsi_20nm_phy_init(struct mdss_panel_data *pdata);



int mdss_dsi_register_recovery_handler(struct mdss_dsi_ctrl_pdata *ctrl,

		struct mdss_panel_recovery *recovery);

drivers/video/msm/mdss/msm_mdss_io_8974.c

+771 −766

File changed.

Preview size limit exceeded, changes collapsed.