-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ASoC: Intel: avs: Add control volume operations
To make introduced peakvol module useful from userspace perspective, expose ALSA controls allowing DSP volume modification. These provide even more granular control over volume but are also the only way to modify volume for devices devoid of codec kcontrols e.g.: DMIC. Co-authored-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20221214185500.3896902-3-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
- Loading branch information
2 people
authored and
Mark Brown
committed
Dec 25, 2022
1 parent
905ea24
commit 585b942
Showing
3 changed files
with
119 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
// SPDX-License-Identifier: GPL-2.0-only | ||
// | ||
// Copyright(c) 2021-2022 Intel Corporation. All rights reserved. | ||
// | ||
// Authors: Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com> | ||
// Cezary Rojewski <cezary.rojewski@intel.com> | ||
// | ||
|
||
#include <sound/soc.h> | ||
#include "avs.h" | ||
#include "control.h" | ||
#include "messages.h" | ||
#include "path.h" | ||
|
||
static struct avs_dev *avs_get_kcontrol_adev(struct snd_kcontrol *kcontrol) | ||
{ | ||
struct snd_soc_dapm_widget *w; | ||
|
||
w = snd_soc_dapm_kcontrol_widget(kcontrol); | ||
|
||
return to_avs_dev(w->dapm->component->dev); | ||
} | ||
|
||
static struct avs_path_module *avs_get_kcontrol_module(struct avs_dev *adev, u32 id) | ||
{ | ||
return NULL; | ||
} | ||
|
||
int avs_control_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | ||
{ | ||
struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; | ||
struct avs_control_data *ctl_data = (struct avs_control_data *)mc->dobj.private; | ||
struct avs_dev *adev = avs_get_kcontrol_adev(kcontrol); | ||
struct avs_volume_cfg *dspvols = NULL; | ||
struct avs_path_module *active_module; | ||
size_t num_dspvols; | ||
int ret = 0; | ||
|
||
/* prevent access to modules while path is being constructed */ | ||
mutex_lock(&adev->path_mutex); | ||
|
||
active_module = avs_get_kcontrol_module(adev, ctl_data->id); | ||
if (active_module) { | ||
ret = avs_ipc_peakvol_get_volume(adev, active_module->module_id, | ||
active_module->instance_id, &dspvols, | ||
&num_dspvols); | ||
if (!ret) | ||
ucontrol->value.integer.value[0] = dspvols[0].target_volume; | ||
|
||
ret = AVS_IPC_RET(ret); | ||
kfree(dspvols); | ||
} else { | ||
ucontrol->value.integer.value[0] = ctl_data->volume; | ||
} | ||
|
||
mutex_unlock(&adev->path_mutex); | ||
return ret; | ||
} | ||
|
||
int avs_control_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | ||
{ | ||
struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; | ||
struct avs_control_data *ctl_data = (struct avs_control_data *)mc->dobj.private; | ||
struct avs_dev *adev = avs_get_kcontrol_adev(kcontrol); | ||
long *volume = &ctl_data->volume; | ||
struct avs_path_module *active_module; | ||
struct avs_volume_cfg dspvol = {0}; | ||
long ctlvol = ucontrol->value.integer.value[0]; | ||
int ret = 0, changed = 0; | ||
|
||
if (ctlvol < 0 || ctlvol > mc->max) | ||
return -EINVAL; | ||
|
||
/* prevent access to modules while path is being constructed */ | ||
mutex_lock(&adev->path_mutex); | ||
|
||
if (*volume != ctlvol) { | ||
*volume = ctlvol; | ||
changed = 1; | ||
} | ||
|
||
active_module = avs_get_kcontrol_module(adev, ctl_data->id); | ||
if (active_module) { | ||
dspvol.channel_id = AVS_ALL_CHANNELS_MASK; | ||
dspvol.target_volume = *volume; | ||
|
||
ret = avs_ipc_peakvol_set_volume(adev, active_module->module_id, | ||
active_module->instance_id, &dspvol); | ||
ret = AVS_IPC_RET(ret); | ||
} | ||
|
||
mutex_unlock(&adev->path_mutex); | ||
|
||
return ret ? ret : changed; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/* SPDX-License-Identifier: GPL-2.0-only */ | ||
/* | ||
* Copyright(c) 2021-2022 Intel Corporation. All rights reserved. | ||
* | ||
* Authors: Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com> | ||
* Cezary Rojewski <cezary.rojewski@intel.com> | ||
*/ | ||
|
||
#ifndef __SOUND_SOC_INTEL_AVS_CTRL_H | ||
#define __SOUND_SOC_INTEL_AVS_CTRL_H | ||
|
||
#include <sound/control.h> | ||
|
||
struct avs_control_data { | ||
u32 id; | ||
|
||
long volume; | ||
}; | ||
|
||
int avs_control_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); | ||
int avs_control_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); | ||
|
||
#endif |