Merge "dsp: fix low volume in audio recording" (2cc3b415) · Commits · e / devices / android_kernel_sony_msm8998

include/sound/q6adm-v2.h

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -197,5 +197,4 @@ int adm_programable_channel_mixer(int port_id, int copp_idx, int session_id,
		int session_type,
		struct msm_pcm_channel_mixer *ch_mixer,
		int channel_index);
		void adm_set_lsm_port_id(int port_id);
		#endif /* __Q6_ADM_V2_H__ */

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -2565,7 +2565,6 @@ static int msm_routing_lsm_func_put(struct snd_kcontrol *kcontrol,

		pr_debug("%s: port_id 0x%x, mad_type %d\n", __func__, port_id,
		mad_type);
		adm_set_lsm_port_id(port_id);
		return afe_port_set_mad_type(port_id, mad_type);
		}

+6 −10

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -98,7 +98,6 @@ struct adm_ctl {
		int num_ec_ref_rx_chans;
		int ec_ref_rx_bit_width;
		int ec_ref_rx_sampling_rate;
		int lsm_port_id;
		};

		static struct adm_ctl this_adm;
		@@ -2139,17 +2138,13 @@ static int get_cal_path(int path)
		return TX_DEVICE;
		}

		void adm_set_lsm_port_id(int port_id)
		{
		this_adm.lsm_port_id = port_id;
		}

		static void send_adm_cal(int port_id, int copp_idx, int path, int perf_mode,
		int app_type, int acdb_id, int sample_rate)
		int app_type, int acdb_id, int sample_rate,
		int passthr_mode)
		{
		pr_debug("%s: port id 0x%x copp_idx %d\n", __func__, port_id, copp_idx);

		if (port_id != this_adm.lsm_port_id)
		if (passthr_mode != LISTEN)
		send_adm_cal_type(ADM_AUDPROC_CAL, path, port_id, copp_idx,
		perf_mode, app_type, acdb_id, sample_rate);
		else
		@@ -2962,7 +2957,8 @@ int adm_matrix_map(int path, struct route_payload payload_map, int perf_mode,
		get_cal_path(path), perf_mode,
		payload_map.app_type[i],
		payload_map.acdb_dev_id[i],
		payload_map.sample_rate[i]);
		payload_map.sample_rate[i],
		passthr_mode);
		/* ADM COPP calibration is already sent */
		clear_bit(ADM_STATUS_CALIBRATION_REQUIRED,
		(void *)&this_adm.copp.