summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2012-03-07 10:38:26 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-01 11:28:21 +0100
commita73fb2df01866b772a48fab93401fe3edbe0b38d (patch)
tree466816bbeb06fc5d3de00f20b5642ef9877d21fa /include/sound
parent01b9d99a1f45befa604543ead29f44fdb0878844 (diff)
downloadop-kernel-dev-a73fb2df01866b772a48fab93401fe3edbe0b38d.zip
op-kernel-dev-a73fb2df01866b772a48fab93401fe3edbe0b38d.tar.gz
ASoC: dapm: Use DAPM mutex for DAPM ops instead of codec mutex
It has now become necessary to use a DAPM mutex instead of the codec mutex to lock the DAPM operations. This is due to the recent multi component support and forth coming Dynamic PCM updates. Currently we lock DAPM operations with the codec mutex of the calling RTD context. However, DAPM operations can span the whole card context and all components. This patch updates the DAPM operations that use the codec mutex to now use the DAPM mutex PCM subclass for all DAPM ops. We also add a mutex subclass for DAPM init and PCM operations. Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h5
-rw-r--r--include/sound/soc.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8da3c24..055242e 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -432,6 +432,11 @@ enum snd_soc_dapm_type {
snd_soc_dapm_dai, /* link to DAI structure */
};
+enum snd_soc_dapm_subclass {
+ SND_SOC_DAPM_CLASS_INIT = 0,
+ SND_SOC_DAPM_CLASS_PCM = 1,
+};
+
/*
* DAPM audio route definition.
*
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 70de2f8..66fd9bc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -805,6 +805,7 @@ struct snd_soc_card {
struct list_head list;
struct mutex mutex;
+ struct mutex dapm_mutex;
bool instantiated;
OpenPOWER on IntegriCloud