Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "dsp: fix low volume in audio recording"

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-15 17:52:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 89e0000fa2
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
asoc/msm-pcm-routing-v2.c
View file

@ -2572,7 +2572,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);
}

24
dsp/q6adm.c
View file

@ -1,4 +1,4 @@
/* 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
@ -104,7 +104,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;
@ -2299,25 +2298,13 @@ static int get_cal_path(int path)
return TX_DEVICE;
}
/*
* Command to set LSM port ID
* which is used to send LSM cal
*
* @port_id: Port ID number to be set
*
*/
void adm_set_lsm_port_id(int port_id)
{
this_adm.lsm_port_id = port_id;
}
EXPORT_SYMBOL(adm_set_lsm_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
@ -3083,7 +3070,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.

3
include/dsp/q6adm-v2.h
View file

@ -1,4 +1,4 @@
/* 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
@ -187,5 +187,4 @@ int adm_programable_channel_mixer(int port_id, int copp_idx, int session_id,
int channel_index);
void msm_dts_srs_acquire_lock(void);
void msm_dts_srs_release_lock(void);
void adm_set_lsm_port_id(int port_id);
#endif /* __Q6_ADM_V2_H__ */