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

Commit 7e6415ab authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dsi: fix kw issues in DSI"

parents 87ad17de 0f4f0fb0

msm/dsi/dsi_ctrl_hw_cmn.c

+4 −4
Original line number Diff line number Diff line
@@ -399,13 +399,13 @@ void dsi_ctrl_hw_cmn_setup_cmd_stream(struct dsi_ctrl_hw *ctrl, 
				     u32 vc_id,

				     struct dsi_rect *roi)

{

	u32 width_final, stride_final;

	u32 height_final;

	u32 width_final = 0, stride_final = 0;

	u32 height_final = 0;

	u32 stream_total = 0, stream_ctrl = 0;

	u32 reg_ctrl = 0, reg_ctrl2 = 0, data = 0;

	u32 reg = 0, offset = 0;

	int pic_width, this_frame_slices, intf_ip_w;

	u32 pkt_per_line, eol_byte_num, bytes_in_slice;

	int pic_width = 0, this_frame_slices = 0, intf_ip_w = 0;

	u32 pkt_per_line = 0, eol_byte_num = 0, bytes_in_slice = 0;



	if (roi && (!roi->w || !roi->h))

		return;

msm/dsi/dsi_pll.c

+6 −4
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ int dsi_pll_init(struct platform_device *pdev, struct dsi_pll_resource **pll) 
	*pll = pll_res;



	label = of_get_property(pdev->dev.of_node, "pll-label", NULL);

	if (!label)

		DSI_PLL_INFO(pll_res, "DSI pll label not specified\n");

	else

	if (!label) {

		DSI_PLL_ERR(pll_res, "DSI pll label not specified\n");

		return 0;

	}



	DSI_PLL_INFO(pll_res, "DSI pll label = %s\n", label);



	/**