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

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

Merge "disp: msm: dsi: use panel's force_clk_lane_hs instead of phy's"

parents 3bc457f2 52fee988

msm/dsi/dsi_defs.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _DSI_DEFS_H_
@@ -537,7 +537,6 @@ struct dsi_video_engine_cfg { 
	bool hsa_lp11_en;

	bool eof_bllp_lp11_en;

	bool bllp_lp11_en;

	bool force_clk_lane_hs;

	enum dsi_video_traffic_mode traffic_mode;

	u32 vc_id;

	u32 dma_sched_line;

msm/dsi/dsi_display.c

+7 −0
Original line number Diff line number Diff line
@@ -3704,6 +3704,13 @@ static int dsi_display_res_init(struct dsi_display *display) 
		goto error_ctrl_put;

	}



	display_for_each_ctrl(i, display) {

		struct msm_dsi_phy *phy = display->ctrl[i].phy;



		phy->cfg.force_clk_lane_hs =

			display->panel->host_config.force_hs_clk_lane;

	}



	rc = dsi_display_parse_lane_map(display);

	if (rc) {

		DSI_ERR("Lane map not found, rc=%d\n", rc);

msm/dsi/dsi_panel.c

+0 −3
Original line number Diff line number Diff line
@@ -1496,9 +1496,6 @@ static int dsi_panel_parse_video_host_config(struct dsi_video_engine_cfg *cfg, 
	cfg->bllp_lp11_en = utils->read_bool(utils->data,

					"qcom,mdss-dsi-bllp-power-mode");



	cfg->force_clk_lane_hs = of_property_read_bool(utils->data,

					"qcom,mdss-dsi-force-clock-lane-hs");



	traffic_mode = utils->get_property(utils->data,

				       "qcom,mdss-dsi-traffic-mode",

				       NULL);

msm/dsi/dsi_phy.c

+1 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/of_device.h>
@@ -331,9 +331,6 @@ static int dsi_phy_settings_init(struct platform_device *pdev, 
			"qcom,dsi-phy-regulator-min-datarate-bps",

			&phy->regulator_min_datarate_bps);



	phy->cfg.force_clk_lane_hs = of_property_read_bool(pdev->dev.of_node,

			"qcom,panel-force-clock-lane-hs");



	return 0;

err:

	lane->count_per_lane = 0;