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

Commit 99c6bb5c authored by Shreyas Narayan's avatar Shreyas Narayan
Browse files

Merge commit '353b81f1' into HEAD 



Change-Id: Ia7c628431fda1eb4295d33d4b1a69e8668e93ffc
Signed-off-by: default avatarShreyas Narayan <shrena@codeaurora.org>
parents adec4f93 353b81f1

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.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2018,2020, 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

drivers/gpu/msm/adreno_drawctxt.c

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

/* Copyright (c) 2002,2007-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
@@ -473,11 +473,12 @@ void adreno_drawctxt_detach(struct kgsl_context *context) 
	drawctxt = ADRENO_CONTEXT(context);

	rb = drawctxt->rb;



	spin_lock(&drawctxt->lock);



	spin_lock(&adreno_dev->active_list_lock);

	list_del_init(&drawctxt->active_node);

	spin_unlock(&adreno_dev->active_list_lock);



	spin_lock(&drawctxt->lock);

	count = drawctxt_detach_drawobjs(drawctxt, list);

	spin_unlock(&drawctxt->lock);

drivers/gpu/msm/adreno_ringbuffer.c

+1 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2007-2017,2019-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2002,2007-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

drivers/gpu/msm/kgsl.c

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-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
@@ -2486,7 +2486,7 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv, 
	return 0;



unmap:

	if (param->type == KGSL_USER_MEM_TYPE_DMABUF) {

	if (kgsl_memdesc_usermem_type(&entry->memdesc) == KGSL_MEM_ENTRY_ION) {

		kgsl_destroy_ion(entry->priv_data);

		entry->memdesc.sgt = NULL;

	}
@@ -2795,7 +2795,7 @@ long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv, 
	return result;



error_attach:

	switch (memtype) {

	switch (kgsl_memdesc_usermem_type(&entry->memdesc)) {

	case KGSL_MEM_ENTRY_ION:

		kgsl_destroy_ion(entry->priv_data);

		entry->memdesc.sgt = NULL;
@@ -4202,6 +4202,8 @@ kgsl_mmap_memstore(struct kgsl_device *device, struct vm_area_struct *vma) 
	if (vma->vm_flags & VM_WRITE)

		return -EPERM;



	vma->vm_flags &= ~VM_MAYWRITE;



	if (memdesc->size  !=  vma_size) {

		KGSL_MEM_ERR(device, "memstore bad size: %d should be %llu\n",

			     vma_size, memdesc->size);