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

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

Merge bb2f8719 on remote branch 

Change-Id: If784916e16192b4c2a36cbbcff4381f389ab64a9
parents e265d462 bb2f8719

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

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ 
			alloc-ranges = <0 0x00000000 0 0xffffffff>;

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x400000>;

			size = <0 0x800000>;

		};



		qseecom_ta_mem: qseecom_ta_region {

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

+5 −3
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2016-2019, 2021, 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
@@ -68,7 +68,8 @@ 
				<&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_1>;

				<&dai_quat_tdm_rx_1>,

				<&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",
@@ -91,7 +92,8 @@ 
				"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.36914";

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

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";

	};

};

drivers/char/adsprpc.c

+6 −2
Original line number Diff line number Diff line
@@ -739,9 +739,13 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map, uint32_t flags) 
	if (!map)

		return;

	fl = map->fl;

	if (!fl)

	/* remote heap and dynamic loading memory

	 * maps expected to initialize with NULL

	 */

	if (!fl && !(map->flags == ADSP_MMAP_HEAP_ADDR ||

				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR))

		return;

	if (!(map->flags == ADSP_MMAP_HEAP_ADDR ||

	if (fl && !(map->flags == ADSP_MMAP_HEAP_ADDR ||

				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR)) {

		cid = fl->cid;

		VERIFY(err, cid >= ADSP_DOMAIN_ID && cid < NUM_CHANNELS);

drivers/gpu/msm/kgsl_iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -225,8 +225,9 @@ static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu, 
static void kgsl_iommu_add_global(struct kgsl_mmu *mmu,

		struct kgsl_memdesc *memdesc, const char *name)

{

	u32 bit, start = 0;

	u32 bit;

	u64 size = kgsl_memdesc_footprint(memdesc);

	int start = 0;



	if (memdesc->gpuaddr != 0)

		return;