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

Commit 2212b1d2 authored by Veera Sundaram Sankaran's avatar Veera Sundaram Sankaran
Browse files

msm: mdss: dsi: fix clk_rate to use u64 instead of u32 



Commit f9c04f16 ("msm: mdss: dsi: add
support for multiple panel timing settings") changed the
mdss-dsi-panel-clockrate parameter read from u64 to u32 during the
restructuring to use panel timings struct. Revert it back to use u64.

Change-Id: I4d0a97f306e10854dfc169550532bf19772e8692
Signed-off-by: default avatarVeera Sundaram Sankaran <veeras@codeaurora.org>
parent ee630a97

drivers/video/msm/mdss/mdss_dsi_panel.c

+6 −2
Original line number Diff line number Diff line
@@ -2106,6 +2106,7 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 
		struct mdss_panel_data *panel_data)

{

	u32 tmp;

	u64 tmp64;

	int rc, i, len;

	const char *data;

	struct mdss_dsi_ctrl_pdata *ctrl_pdata;
@@ -2164,8 +2165,11 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 


	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-framerate", &tmp);

	pt->timing.frame_rate = !rc ? tmp : DEFAULT_FRAME_RATE;

	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-clockrate", &tmp);

	pt->timing.clk_rate = !rc ? tmp : 0;

	rc = of_property_read_u64(np, "qcom,mdss-dsi-panel-clockrate", &tmp64);

	if (rc == -EOVERFLOW)

		rc = of_property_read_u32(np,

			"qcom,mdss-dsi-panel-clockrate", (u32 *)&tmp64);

	pt->timing.clk_rate = !rc ? tmp64 : 0;



	data = of_get_property(np, "qcom,mdss-dsi-panel-timings", &len);

	if ((!data) || (len != 12)) {

drivers/video/msm/mdss/mdss_panel.h

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ struct mdss_panel_timing { 


	u32 lm_widths[2];



	u32 clk_rate;

	u64 clk_rate;

	char frame_rate;



	u8 dsc_enc_total;