A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

asoc: Reorder list used in topology search

Browse source 
Routing driver searches CAL_TYPE list for a matching
topology and then searches the LSM_CAL_TYPE list if
no entry is found in the first list.
If it so happens that a capture type cal block is
present in the CAL_TYPE list, it will be picked even
though the correct entry is present in the LSM_CAL_TYPE list.
Flip the order to give priority to LSM_CAL_TYPE list.
We expect only LSM clients to populate this list and
also enforce exact match for LSM clients.

CRs-Fixed: 2250684
Change-Id: I2ab3481b43a5d8b059a20cb919ff097fc8cf2774
Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org>
This commit is contained in:
Haynes Mathew George 2018-06-08 17:26:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4728d6b2b5
1 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1113,7 +1113,8 @@ static struct cal_block_data *msm_routing_find_topology_by_path(int path,
static struct cal_block_data *msm_routing_find_topology(int path,
int app_type,
int acdb_id,
int cal_index)
int cal_index,
bool exact)
{
struct list_head *ptr, *next;
struct cal_block_data *cal_block = NULL;
@ -1138,9 +1139,29 @@ static struct cal_block_data *msm_routing_find_topology(int path,
return cal_block;
}
}
pr_debug("%s: Can't find topology for path %d, app %d, acdb_id %d defaulting to search by path\n",
__func__, path, app_type, acdb_id);
return msm_routing_find_topology_by_path(path, cal_index);
pr_debug("%s: Can't find topology for path %d, app %d, "
"acdb_id %d %s\n", __func__, path, app_type, acdb_id,
exact ? "fail" : "defaulting to search by path");
return exact ? NULL : msm_routing_find_topology_by_path(path,
cal_index);
}
static int msm_routing_find_topology_on_index(int session_type, int app_type,
int acdb_dev_id, int idx,
bool exact)
{
int topology = -EINVAL;
struct cal_block_data *cal_block = NULL;
mutex_lock(&cal_data[idx]->lock);
cal_block = msm_routing_find_topology(session_type, app_type,
acdb_dev_id, idx, exact);
if (cal_block != NULL) {
topology = ((struct audio_cal_info_adm_top *)
cal_block->cal_info)->topology;
}
mutex_unlock(&cal_data[idx]->lock);
return topology;
}
/*
@ -1152,7 +1173,6 @@ static int msm_routing_get_adm_topology(int fedai_id, int session_type,
int be_id)
{
int topology = NULL_COPP_TOPOLOGY;
struct cal_block_data *cal_block = NULL;
int app_type = 0, acdb_dev_id = 0;
pr_debug("%s: fedai_id %d, session_type %d, be_id %d\n",
@ -1165,31 +1185,22 @@ static int msm_routing_get_adm_topology(int fedai_id, int session_type,
acdb_dev_id =
fe_dai_app_type_cfg[fedai_id][session_type][be_id].acdb_dev_id;
mutex_lock(&cal_data[ADM_TOPOLOGY_CAL_TYPE_IDX]->lock);
cal_block = msm_routing_find_topology(session_type, app_type,
acdb_dev_id,
ADM_TOPOLOGY_CAL_TYPE_IDX);
if (cal_block != NULL) {
topology = ((struct audio_cal_info_adm_top *)
cal_block->cal_info)->topology;
cal_utils_mark_cal_used(cal_block);
mutex_unlock(&cal_data[ADM_TOPOLOGY_CAL_TYPE_IDX]->lock);
} else {
mutex_unlock(&cal_data[ADM_TOPOLOGY_CAL_TYPE_IDX]->lock);
pr_debug("%s: Check for LSM topology\n", __func__);
mutex_lock(&cal_data[ADM_LSM_TOPOLOGY_CAL_TYPE_IDX]->lock);
cal_block = msm_routing_find_topology(session_type, app_type,
acdb_dev_id,
ADM_LSM_TOPOLOGY_CAL_TYPE_IDX);
if (cal_block != NULL) {
topology = ((struct audio_cal_info_adm_top *)
cal_block->cal_info)->topology;
cal_utils_mark_cal_used(cal_block);
}
mutex_unlock(&cal_data[ADM_LSM_TOPOLOGY_CAL_TYPE_IDX]->lock);
pr_debug("%s: Check for exact LSM topology\n", __func__);
topology = msm_routing_find_topology_on_index(session_type,
app_type,
acdb_dev_id,
ADM_LSM_TOPOLOGY_CAL_TYPE_IDX,
true /*exact*/);
if (topology < 0) {
pr_debug("%s: Check for compatible topology\n", __func__);
topology = msm_routing_find_topology_on_index(session_type,
app_type,
acdb_dev_id,
ADM_TOPOLOGY_CAL_TYPE_IDX,
false /*exact*/);
if (topology < 0)
topology = NULL_COPP_TOPOLOGY;
}
done:
pr_debug("%s: Using topology %d\n", __func__, topology);
return topology;