Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (4aac539f) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/dsi-panel-sim-cmd.dtsi

+130 −14

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, 2017-2018, 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
		@@ -49,26 +49,22 @@

		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-width = <640>;
		qcom,mdss-dsi-panel-height = <480>;
		qcom,mdss-dsi-h-front-porch = <20>;
		qcom,mdss-dsi-h-back-porch = <20>;
		qcom,mdss-dsi-h-pulse-width = <16>;
		qcom,mdss-dsi-panel-width = <1440>;
		qcom,mdss-dsi-panel-height = <2560>;
		qcom,mdss-dsi-h-front-porch = <120>;
		qcom,mdss-dsi-h-back-porch = <100>;
		qcom,mdss-dsi-h-pulse-width = <40>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <16>;
		qcom,mdss-dsi-v-front-porch = <4>;
		qcom,mdss-dsi-v-pulse-width = <1>;
		qcom,mdss-dsi-v-back-porch = <100>;
		qcom,mdss-dsi-v-front-porch = <100>;
		qcom,mdss-dsi-v-pulse-width = <40>;
		qcom,mdss-dsi-h-left-border = <0>;
		qcom,mdss-dsi-h-right-border = <0>;
		qcom,mdss-dsi-v-top-border = <0>;
		qcom,mdss-dsi-v-bottom-border = <0>;
		qcom,mdss-dsi-h-sync-pulse = <0>;
		qcom,mdss-dsi-panel-framerate = <60>;
		qcom,mdss-dsi-hor-line-idle = <0 40 256>,
		<40 120 128>,
		<120 240 64>;
		qcom,mdss-dsi-panel-timings =
		[cd 32 22 00 60 64 26 34 29 03 04 00];
		[00 21 09 09 24 23 08 08 08 03 04 00];
		qcom,mdss-dsi-on-command =
		[29 01 00 00 00 00 02 b0 03
		05 01 00 00 0a 00 01 00
		@@ -98,6 +94,126 @@
		[05 01 00 00 32 00 02 28 00
		05 01 00 00 78 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

		qcom,compression-mode = "dsc";
		qcom,mdss-dsc-slice-height = <40>;
		qcom,mdss-dsc-slice-width = <720>;
		qcom,mdss-dsc-slice-per-pkt = <1>;
		qcom,mdss-dsc-bit-per-component = <8>;
		qcom,mdss-dsc-bit-per-pixel = <8>;
		qcom,mdss-dsc-block-prediction-enable;
		};

		timing@1{
		qcom,mdss-dsi-panel-width = <1080>;
		qcom,mdss-dsi-panel-height = <1920>;
		qcom,mdss-dsi-h-front-porch = <120>;
		qcom,mdss-dsi-h-back-porch = <460>;
		qcom,mdss-dsi-h-pulse-width = <40>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <100>;
		qcom,mdss-dsi-v-front-porch = <740>;
		qcom,mdss-dsi-v-pulse-width = <40>;
		qcom,mdss-dsi-h-left-border = <0>;
		qcom,mdss-dsi-h-right-border = <0>;
		qcom,mdss-dsi-v-top-border = <0>;
		qcom,mdss-dsi-v-bottom-border = <0>;
		qcom,mdss-dsi-panel-framerate = <60>;
		qcom,mdss-dsi-panel-timings =
		[00 21 09 09 24 23 08 08 08 03 04 00];
		qcom,mdss-dsi-on-command =
		[29 01 00 00 00 00 02 b0 03
		05 01 00 00 0a 00 01 00
		/* Soft reset, wait 10ms */
		15 01 00 00 0a 00 02 3a 77
		/* Set Pixel format (24 bpp) */
		39 01 00 00 0a 00 05 2a 00 00 04 ff
		/* Set Column address */
		39 01 00 00 0a 00 05 2b 00 00 05 9f
		/* Set page address */
		15 01 00 00 0a 00 02 35 00
		/* Set tear on */
		39 01 00 00 0a 00 03 44 00 00
		/* Set tear scan line */
		15 01 00 00 0a 00 02 51 ff
		/* write display brightness */
		15 01 00 00 0a 00 02 53 24
		/* write control brightness */
		15 01 00 00 0a 00 02 55 00
		/* CABC brightness */
		05 01 00 00 78 00 01 11
		/* exit sleep mode, wait 120ms */
		05 01 00 00 10 00 01 29];
		/* Set display on, wait 16ms */
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command =
		[05 01 00 00 32 00 02 28 00
		05 01 00 00 78 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

		qcom,compression-mode = "dsc";
		qcom,mdss-dsc-slice-height = <40>;
		qcom,mdss-dsc-slice-width = <540>;
		qcom,mdss-dsc-slice-per-pkt = <1>;
		qcom,mdss-dsc-bit-per-component = <8>;
		qcom,mdss-dsc-bit-per-pixel = <8>;
		qcom,mdss-dsc-block-prediction-enable;
		};

		timing@2{
		qcom,mdss-dsi-panel-width = <720>;
		qcom,mdss-dsi-panel-height = <1280>;
		qcom,mdss-dsi-h-front-porch = <100>;
		qcom,mdss-dsi-h-back-porch = <840>;
		qcom,mdss-dsi-h-pulse-width = <40>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <100>;
		qcom,mdss-dsi-v-front-porch = <1380>;
		qcom,mdss-dsi-v-pulse-width = <40>;
		qcom,mdss-dsi-h-left-border = <0>;
		qcom,mdss-dsi-h-right-border = <0>;
		qcom,mdss-dsi-v-top-border = <0>;
		qcom,mdss-dsi-v-bottom-border = <0>;
		qcom,mdss-dsi-panel-framerate = <60>;
		qcom,mdss-dsi-panel-timings =
		[00 21 09 09 24 23 08 08 08 03 04 00];
		qcom,mdss-dsi-on-command =
		[29 01 00 00 00 00 02 b0 03
		05 01 00 00 0a 00 01 00
		/* Soft reset, wait 10ms */
		15 01 00 00 0a 00 02 3a 77
		/* Set Pixel format (24 bpp) */
		39 01 00 00 0a 00 05 2a 00 00 04 ff
		/* Set Column address */
		39 01 00 00 0a 00 05 2b 00 00 05 9f
		/* Set page address */
		15 01 00 00 0a 00 02 35 00
		/* Set tear on */
		39 01 00 00 0a 00 03 44 00 00
		/* Set tear scan line */
		15 01 00 00 0a 00 02 51 ff
		/* write display brightness */
		15 01 00 00 0a 00 02 53 24
		/* write control brightness */
		15 01 00 00 0a 00 02 55 00
		/* CABC brightness */
		05 01 00 00 78 00 01 11
		/* exit sleep mode, wait 120ms */
		05 01 00 00 10 00 01 29];
		/* Set display on, wait 16ms */
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command =
		[05 01 00 00 32 00 02 28 00
		05 01 00 00 78 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

		qcom,compression-mode = "dsc";
		qcom,mdss-dsc-slice-height = <40>;
		qcom,mdss-dsc-slice-width = <360>;
		qcom,mdss-dsc-slice-per-pkt = <1>;
		qcom,mdss-dsc-bit-per-component = <8>;
		qcom,mdss-dsc-bit-per-pixel = <8>;
		qcom,mdss-dsc-block-prediction-enable;
		};
		};
		};

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+28 −6

Original line number	Diff line number	Diff line
		@@ -571,8 +571,30 @@
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 0 1>,
		<2 0 1>;
		qcom,default-topology-index = <0>;
		<2 2 1>;
		qcom,default-topology-index = <1>;
		qcom,panel-roi-alignment = <720 40 720 40 720 40>;
		qcom,partial-update-enabled = "single_roi";
		};

		timing@1{
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 0 1>,
		<2 2 1>;
		qcom,default-topology-index = <1>;
		qcom,panel-roi-alignment = <540 40 540 40 540 40>;
		qcom,partial-update-enabled = "single_roi";
		};

		timing@2{
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 0 1>,
		<2 2 1>;
		qcom,default-topology-index = <1>;
		qcom,panel-roi-alignment = <360 40 360 40 360 40>;
		qcom,partial-update-enabled = "single_roi";
		};
		};
		};
		@@ -608,14 +630,14 @@
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-display-timings {
		timing@0 { /* 1080p */
		qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07
		07 04 03 04 00];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 1 1>;
		qcom,default-topology-index = <0>;
		};
		timing@1 { /* qhd */
		qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07
		07 04 03 04 00];
		qcom,mdss-dsi-panel-phy-timings = [00 1e 08 07 24 22 08
		08 05 03 04 00 19 18];
		qcom,display-topology = <1 1 1>,
		<2 2 1>, /* dsc merge */
		<2 1 1>; /* 3d mux */

arch/arm64/boot/dts/qcom/sm8150-sde.dtsi

+40 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,19 @@
		qcom,supply-disable-load = <4>;
		};
		};
		qcom,core-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,core-supply-entry@0 {
		reg = <0>;
		qcom,supply-name = "refgen";
		qcom,supply-min-voltage = <0>;
		qcom,supply-max-voltage = <0>;
		qcom,supply-enable-load = <0>;
		qcom,supply-disable-load = <0>;
		};
		};
		};

		mdss_dsi1: qcom,mdss_dsi_ctrl1@ae96000 {
		@@ -540,6 +553,19 @@
		qcom,supply-disable-load = <4>;
		};
		};
		qcom,core-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,core-supply-entry@0 {
		reg = <0>;
		qcom,supply-name = "refgen";
		qcom,supply-min-voltage = <0>;
		qcom,supply-max-voltage = <0>;
		qcom,supply-enable-load = <0>;
		qcom,supply-disable-load = <0>;
		};
		};
		};

		mdss_dsi_phy0: qcom,mdss_dsi_phy0@ae94400 {
		@@ -700,5 +726,19 @@
		qcom,supply-disable-load = <32>;
		};
		};

		qcom,core-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,core-supply-entry@0 {
		reg = <0>;
		qcom,supply-name = "refgen";
		qcom,supply-min-voltage = <0>;
		qcom,supply-max-voltage = <0>;
		qcom,supply-enable-load = <0>;
		qcom,supply-disable-load = <0>;
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/sm8150.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -2739,6 +2739,10 @@
		<&apps_smmu 0x0516 0x0011>;
		};

		qcom_msmhdcp: qcom,msm_hdcp {
		compatible = "qcom,msm-hdcp";
		};

		qcom_crypto: qcrypto@1de0000 {
		compatible = "qcom,qcrypto";
		reg = <0x1de0000 0x20000>,

arch/arm64/configs/sm8150-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_HDCP_QSEECOM=y
		CONFIG_QSEECOM=y
		CONFIG_UID_SYS_STATS=y
		CONFIG_MEMORY_STATE_TIME=y