Merge 4bfc77a589433bd3587aa50b63f739c701efc526 on remote branch (89ffd3d7) · Commits · e / devices / android_kernel_sony_msm8998

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

+11 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, 2019-2020 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
		@@ -293,6 +293,16 @@
		qcom,msm-dai-q6-dev-id = <32770>;
		};

		proxy_rx: qcom,msm-dai-q6-proxy-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <8194>;
		};

		proxy_tx: qcom,msm-dai-q6-proxy-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <8195>;
		};

		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <28672>;

arch/arm/boot/dts/qcom/msm8998-audio.dtsi

+9 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, 2019-2020 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
		@@ -122,7 +122,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>,
		<&proxy_rx>, <&proxy_tx>;
		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",
		@@ -144,7 +145,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-dev.8194", "msm-dai-q6-dev.8195";
		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		"msm-ext-disp-audio-codec-rx";
		@@ -255,7 +257,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>,
		<&proxy_rx>, <&proxy_tx>;
		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",
		@@ -277,7 +280,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-dev.8194", "msm-dai-q6-dev.8195";
		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		"msm-ext-disp-audio-codec-rx";

arch/arm64/configs/msmcortex-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ CONFIG_SCHED_HMP=y
		CONFIG_SCHED_HMP_CSTATE_AWARE=y
		CONFIG_SCHED_CORE_CTL=y
		CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_SCHED_AUTOGROUP=y
		CONFIG_SCHED_TUNE=y

arch/arm64/configs/msmcortex_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ CONFIG_SCHED_HMP=y
		CONFIG_SCHED_HMP_CSTATE_AWARE=y
		CONFIG_SCHED_CORE_CTL=y
		CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_SCHED_AUTOGROUP=y
		CONFIG_SCHED_TUNE=y

drivers/android/binder.c

+10 −25

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ struct binder_device {
		struct binder_work {
		struct list_head entry;

		enum {
		enum binder_work_type {
		BINDER_WORK_TRANSACTION = 1,
		BINDER_WORK_TRANSACTION_COMPLETE,
		BINDER_WORK_RETURN_ERROR,
		@@ -921,27 +921,6 @@ static struct binder_work *binder_dequeue_work_head_ilocked(
		return w;
		}

		/**
		* binder_dequeue_work_head() - Dequeues the item at head of list
		* @proc: binder_proc associated with list
		* @list: list to dequeue head
		*
		* Removes the head of the list if there are items on the list
		*
		* Return: pointer dequeued binder_work, NULL if list was empty
		*/
		static struct binder_work *binder_dequeue_work_head(
		struct binder_proc *proc,
		struct list_head *list)
		{
		struct binder_work *w;

		binder_inner_proc_lock(proc);
		w = binder_dequeue_work_head_ilocked(list);
		binder_inner_proc_unlock(proc);
		return w;
		}

		static void
		binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
		static void binder_free_thread(struct binder_thread *thread);
		@@ -4442,13 +4421,17 @@ static void binder_release_work(struct binder_proc *proc,
		struct list_head *list)
		{
		struct binder_work *w;
		enum binder_work_type wtype;

		while (1) {
		w = binder_dequeue_work_head(proc, list);
		binder_inner_proc_lock(proc);
		w = binder_dequeue_work_head_ilocked(list);
		wtype = w ? w->type : 0;
		binder_inner_proc_unlock(proc);
		if (!w)
		return;

		switch (w->type) {
		switch (wtype) {
		case BINDER_WORK_TRANSACTION: {
		struct binder_transaction *t;

		@@ -4482,9 +4465,11 @@ static void binder_release_work(struct binder_proc *proc,
		kfree(death);
		binder_stats_deleted(BINDER_STAT_DEATH);
		} break;
		case BINDER_WORK_NODE:
		break;
		default:
		pr_err("unexpected work type, %d, not freed\n",
		w->type);
		wtype);
		break;
		}
		}