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

Commit 4163adf2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: DRM: Change eDRM display pipe"

parents ee023880 90201f74

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+19 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1643,11 +1643,27 @@ 
	};

};



/ {

&sde_kms {

	qcom,sde-reserved-plane {

		qcom,sde-plane-id@0 {

		reserved_plane0: qcom,sde-reserved-plane@0 {

			reg = <0x0>;

			qcom,plane-name = "vig0";

			lm-stage = <4>;

		};

		reserved_plane1: qcom,sde-reserved-plane@1 {

			reg = <0x1>;

			qcom,plane-name = "vig3";

			lm-stage = <5>;

		};

	};

};



&msm_kms_edrm {

	qcom,edrm-assigned-display {

		qcom,edrm-display-id@0 {

			qcom,label = "dsi_adv_7533_1";

			qcom,intf-type = "dsi";

			qcom,assigned_plane = <&reserved_plane1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+19 −2
Original line number Diff line number Diff line
@@ -1468,11 +1468,28 @@ 
	};

};



/ {

&sde_kms {

	qcom,sde-reserved-plane {

		qcom,sde-plane-id@0 {

		reserved_plane0: qcom,sde-reserved-plane@0 {

			reg = <0x0>;

			qcom,plane-name = "vig0";

			lm-stage = <4>;

		};

		reserved_plane1: qcom,sde-reserved-plane@1 {

			reg = <0x1>;

			qcom,plane-name = "rgb3";

			lm-stage = <5>;

		};

	};

};



&msm_kms_edrm {

	qcom,edrm-assigned-display {

		qcom,edrm-display-id@0 {

			qcom,label = "dsi_adv_7533_1";

			qcom,intf-type = "dsi";

			qcom,ctl-id = <1>;

			qcom,assigned_plane = <&reserved_plane1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -259,7 +259,7 @@ 
			<&clock_mmss clk_ext_pclk0_clk_src>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		qcom,dsi-panel = <&dsi_adv7533_720p>;

		qcom,dsi-panel = <&dsi_adv7533_1080p>;

		vddio-supply = <&pm8994_l14>;

		qcom,bridge-index = <0>;

	};
@@ -275,7 +275,7 @@ 
			<&clock_mmss clk_ext_pclk1_clk_src>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		qcom,dsi-panel = <&dsi_adv7533_720p>;

		qcom,dsi-panel = <&dsi_adv7533_1080p>;

		vddio-supply = <&pm8994_l14>;

		qcom,bridge-index = <1>;

	};

arch/arm/boot/dts/qcom/msm8996-sde.dtsi

+10 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -537,3 +537,12 @@ 
		};

	};

};



&soc {

	msm_kms_edrm: qcom,msm_kms_edrm@900000 {



		compatible = "qcom,msm-kms-edrm";

		contiguous-region = <&cont_splash_mem &cont_splash_mem_hdmi>;



	};

};

drivers/gpu/drm/msm/ekms/edrm_kms.c

+3 −1
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static int _edrm_kms_parse_dt(struct msm_edrm_kms *edrm_kms) 
			}



			plane = edrm_plane_init(edrm_kms->dev,

					edrm_kms->plane_id[disp_cnt]);

					edrm_kms->plane_id[disp_cnt],

					sspp_type);

			if (IS_ERR(plane)) {

				pr_err("edrm_plane_init failed\n");

				ret = PTR_ERR(plane);
@@ -431,6 +432,7 @@ static int _edrm_kms_parse_dt(struct msm_edrm_kms *edrm_kms) 
			edrm_plane->lm_stage = lm_stage;

			edrm_plane->sspp_offset = sspp_offset;

			edrm_plane->sspp_cfg_id = sspp_cfg_id;

			edrm_plane->sspp_type = sspp_type;

			plane->possible_crtcs = (1 << disp_cnt);

			priv->num_planes++;

			plane_cnt++;