samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "asoc: msm_common: call spf_apm_close_all only once"

Telusuri Sumber
This commit is contained in:
qctecmdr
2022-11-22 06:23:16 -08:00
committed by Gerrit - the friendly Code Review server
orang tua 7e16f6c859 7047b7ab7f
melakukan 39fbfeb33a
2 mengubah file dengan 25 tambahan dan 24 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

33
asoc/msm_common.c
Melihat File

@@ -124,8 +124,6 @@ static ssize_t aud_dev_sysfs_store(struct kobject *kobj,
pr_debug("%s: pcm_id %d state %d \n", __func__, pcm_id, state);
pdata->aud_dev_state[pcm_id] = state;
if ( state == DEVICE_ENABLE && (pdata->dsp_sessions_closed != 0))
pdata->dsp_sessions_closed = 0;
ret = count;
done:
@@ -236,22 +234,29 @@ done:
static void check_userspace_service_state(struct snd_soc_pcm_runtime *rtd,
struct msm_common_pdata *pdata)
{
dev_info(rtd->card->dev,"%s: pcm_id %d state %d\n", __func__,
rtd->num, pdata->aud_dev_state[rtd->num]);
uint32_t i;
dev_info(rtd->card->dev,"%s: pcm_id %d state %d\n", __func__,
rtd->num, pdata->aud_dev_state[rtd->num]);
mutex_lock(&pdata->aud_dev_lock);
if (pdata->aud_dev_state[rtd->num] == DEVICE_ENABLE) {
dev_info(rtd->card->dev, "%s userspace service crashed\n",
__func__);
if (pdata->dsp_sessions_closed == 0) {
/*Issue close all graph cmd to DSP*/
spf_core_apm_close_all();
/*unmap all dma mapped buffers*/
msm_audio_ion_crash_handler();
pdata->dsp_sessions_closed = 1;
}
__func__);
/*Reset the state as sysfs node wont be triggred*/
pdata->aud_dev_state[rtd->num] = 0;
pdata->aud_dev_state[rtd->num] = DEVICE_DISABLE;
for (i = 0; i < pdata->num_aud_devs; i++) {
if (pdata->aud_dev_state[i] == DEVICE_ENABLE)
goto exit;
}
/*Issue close all graph cmd to DSP*/
spf_core_apm_close_all();
/*unmap all dma mapped buffers*/
msm_audio_ion_crash_handler();
}
exit:
mutex_unlock(&pdata->aud_dev_lock);
return;
}
static int get_mi2s_tdm_auxpcm_intf_index(const char *stream_name)
@@ -777,6 +782,7 @@ int msm_common_snd_init(struct platform_device *pdev, struct snd_soc_card *card)
sizeof(uint8_t), GFP_KERNEL);
dev_info(&pdev->dev, "num_links %d \n", card->num_links);
common_pdata->num_aud_devs = card->num_links;
mutex_init(&common_pdata->aud_dev_lock);
aud_dev_sysfs_init(common_pdata);
@@ -797,6 +803,7 @@ void msm_common_snd_deinit(struct msm_common_pdata *common_pdata)
msm_audio_remove_qos_request();
mutex_destroy(&common_pdata->aud_dev_lock);
for (count = 0; count < MI2S_TDM_AUXPCM_MAX; count++) {
mutex_destroy(&common_pdata->lock[count]);
}

16
asoc/msm_common.h
Melihat File

@@ -1,13 +1,7 @@
/* Copyright (c) 2020-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
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef _MSM_COMMON_H_
#define _MSM_COMMON_H_
@@ -40,7 +34,7 @@ typedef enum snd_card_status_t {
struct msm_common_pdata {
uint8_t *aud_dev_state;
struct kobject aud_dev_kobj;
uint8_t dsp_sessions_closed;
struct mutex aud_dev_lock;
uint32_t num_aud_devs;
struct device_node *mi2s_gpio_p[MI2S_TDM_AUXPCM_MAX];
struct mutex lock[MI2S_TDM_AUXPCM_MAX];