Merge 555c6a048e537bcf7c9b40a93dfbee762503c7d2 on remote branch (6a03eddc) · Commits · e / devices / android_kernel_sony_msm8998

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

+23 −7

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2017, 2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2017, 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
		@@ -357,6 +357,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>;
		@@ -679,7 +689,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-dp.24608", "msm-dai-q6-mi2s.0",
		"msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		@@ -702,7 +713,8 @@
		"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.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";
		@@ -784,7 +796,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-dp.24608", "msm-dai-q6-mi2s.0",
		"msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		@@ -807,7 +820,8 @@
		"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.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";
		@@ -893,7 +907,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-dp.24608", "msm-dai-q6-mi2s.0",
		"msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		@@ -912,7 +927,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>, <&msm_digital_codec>,
		<&pmic_analog_codec>, <&msm_sdw_codec>,
		<&ext_disp_audio_codec>;

drivers/gpu/msm/adreno.c

+14 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2002,2007-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
		@@ -2827,6 +2827,19 @@ static void adreno_resume_device(struct kgsl_device *device)
		adreno_dispatcher_unhalt(device);
		}

		u32 adreno_get_ucode_version(const u32 *data)
		{
		u32 version;

		version = data[1];

		if ((version & 0xf) != 0xa)
		return version;

		version &= ~0xfff;
		return version \| ((data[3] & 0xfff000) >> 12);
		}

		static const struct kgsl_functable adreno_functable = {
		/* Mandatory functions */
		.regread = adreno_regread,

drivers/gpu/msm/adreno.h

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2008-2018,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
		@@ -942,6 +942,8 @@ int adreno_efuse_read_u32(struct adreno_device *adreno_dev, unsigned int offset,
		unsigned int *val);
		void adreno_efuse_unmap(struct adreno_device *adreno_dev);

		u32 adreno_get_ucode_version(const u32 *data);

		#define ADRENO_TARGET(_name, _id) \
		static inline int adreno_is_##_name(struct adreno_device *adreno_dev) \
		{ \

drivers/gpu/msm/adreno_a5xx.c

+9 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2018,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
		@@ -2177,12 +2177,15 @@ static int a5xx_post_start(struct adreno_device *adreno_dev)
		*cmds++ = 0xF;
		}

		if (adreno_is_preemption_enabled(adreno_dev))
		if (adreno_is_preemption_enabled(adreno_dev)) {
		cmds += _preemption_init(adreno_dev, rb, cmds, NULL);

		rb->_wptr = rb->_wptr - (42 - (cmds - start));

		ret = adreno_ringbuffer_submit_spin_nosync(rb, NULL, 2000);
		} else {
		rb->_wptr = rb->_wptr - (42 - (cmds - start));
		ret = adreno_ringbuffer_submit_spin(rb, NULL, 2000);
		}

		if (ret)
		spin_idle_debug(KGSL_DEVICE(adreno_dev),
		"hw initialization failed to idle\n");
		@@ -2554,7 +2557,7 @@ static int _load_firmware(struct kgsl_device device, const char fwfile,

		memcpy(ucode->hostptr, &fw->data[4], fw->size - 4);
		*ucode_size = (fw->size - 4) / sizeof(uint32_t);
		ucode_version = (unsigned int *)&fw->data[4];
		ucode_version = adreno_get_ucode_version((u32 )fw->data);

		done:
		release_firmware(fw);

drivers/gpu/msm/adreno_a5xx.h

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016,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
		@@ -112,7 +112,7 @@ void a5xx_crashdump_init(struct adreno_device *adreno_dev);

		void a5xx_hwcg_set(struct adreno_device *adreno_dev, bool on);

		#define A5XX_CP_RB_CNTL_DEFAULT (((ilog2(4) << 8) & 0x1F00) \| \
		#define A5XX_CP_RB_CNTL_DEFAULT ((1 << 27) \| ((ilog2(4) << 8) & 0x1F00) \| \
		(ilog2(KGSL_RB_DWORDS >> 1) & 0x3F))
		/* GPMU interrupt multiplexor */
		#define FW_INTR_INFO (0)