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

Commit e4bc5ff2 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 890e3841 on remote branch 

Change-Id: I9b62885540917d69db24c8150fc812f8264daaf0
parents 497a93c0 890e3841

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ Optional properties: 
					255 = default value.

- qcom,mdss-brightness-max-level:	Specifies the max brightness level supported.

					255 = default value.

- qcom,bl-update-flag:			A string that specifies controls for backlight update of the panel.

					"delay_until_first_frame" = Delay backlight update of the panel

					until the first frame is received from the HW.

- qcom,mdss-dsi-interleave-mode:	Specifies interleave mode.

					0 = default value.

- qcom,mdss-dsi-panel-type:		Specifies the panel operating mode.
@@ -600,6 +603,7 @@ Example: 
		qcom,mdss-dsi-bl-min-level = <1>;

		qcom,mdss-dsi-bl-max-level = < 15>;

		qcom,mdss-brightness-max-level = <255>;

		qcom,bl-update-flag = "delay_until_first_frame";

		qcom,mdss-dsi-interleave-mode = <0>;

		qcom,mdss-dsi-panel-type = "dsi_video_mode";

		qcom,mdss-dsi-te-check-enable;

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+2 −2
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
@@ -509,7 +509,7 @@ 
		};

	};



	qcom,msm-dai-tdm-quat-rx {

	msm_dai_tdm_quat_rx: qcom,msm-dai-tdm-quat-rx {

		compatible = "qcom,msm-dai-tdm";

		qcom,msm-cpudai-tdm-group-id = <37168>;

		qcom,msm-cpudai-tdm-group-num-ports = <1>;

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

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

/* Copyright (c) 2017-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
@@ -1621,6 +1621,7 @@ 
		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

		qcom,dynamic-wakeup-source;

	};



	qcom,ipc_router_cdsp_xprt {

arch/arm64/boot/dts/qcom/sdm845-audio.dtsi

+15 −3
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
@@ -67,7 +67,8 @@ 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_rx_1>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -89,7 +90,8 @@ 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36914";

	};

};
@@ -99,3 +101,13 @@ 
		elemental-addr = [ff ff ff fe 17 02];

	};

};



&msm_dai_tdm_quat_rx {

	qcom,msm-cpudai-tdm-group-num-ports = <2>;

	qcom,msm-cpudai-tdm-group-port-id = <36912 36914>;

	dai_quat_tdm_rx_1: qcom,msm-dai-q6-tdm-quat-rx-1 {

		compatible = "qcom,msm-dai-q6-tdm";

		qcom,msm-cpudai-tdm-dev-id = <36914>;

		qcom,msm-cpudai-tdm-data-align = <0>;

	};

};

drivers/android/binder_alloc.c

+8 −10
Original line number Diff line number Diff line
@@ -924,14 +924,13 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 


	index = page - alloc->pages;

	page_addr = (uintptr_t)alloc->buffer + index * PAGE_SIZE;

	vma = alloc->vma;

	if (vma) {

		if (!mmget_not_zero(alloc->vma_vm_mm))

			goto err_mmget;



	mm = alloc->vma_vm_mm;

	if (!mmget_not_zero(mm))

		goto err_mmget;

	if (!down_write_trylock(&mm->mmap_sem))

		goto err_down_write_mmap_sem_failed;

	}

	vma = alloc->vma;



	list_lru_isolate(lru, item);

	spin_unlock(lock);
@@ -945,10 +944,9 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 
			       PAGE_SIZE, NULL);



		trace_binder_unmap_user_end(alloc, index);



	}

	up_write(&mm->mmap_sem);

	mmput(mm);

	}



	trace_binder_unmap_kernel_start(alloc, index);