leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda - Fix stream and channel-ids codec-bus wide

Browse Source 
The new sticky PCM parameter introduced the delayed clean-ups of
stream- and channel-id tags.  In the current implementation, this check
(adding dirty flag) and actual clean-ups are done only for the codec
chip.  However, with HD-audio architecture, multiple codecs can be
on a single bus, and the controller assign stream- and channel-ids in
the bus-wide.

In this patch, the stream-id and channel-id are checked over all codecs
connected to the corresponding bus.  Together with it, the mutex is
moved to struct hda_bus, as this becomes also bus-wide.

Reported-and-tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2010-08-20 09:44:36 +02:00
parent 4f34760787
commit 3f50ac6a0e
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/pci/hda/hda_codec.c
View File

@ -589,6 +589,7 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
bus->ops = temp->ops; bus->ops = temp->ops;
mutex_init(&bus->cmd_mutex); mutex_init(&bus->cmd_mutex);
mutex_init(&bus->prepare_mutex);
INIT_LIST_HEAD(&bus->codec_list); INIT_LIST_HEAD(&bus->codec_list);
snprintf(bus->workq_name, sizeof(bus->workq_name), snprintf(bus->workq_name, sizeof(bus->workq_name),
@ -1068,7 +1069,6 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,
codec->addr = codec_addr; codec->addr = codec_addr;
mutex_init(&codec->spdif_mutex); mutex_init(&codec->spdif_mutex);
mutex_init(&codec->control_mutex); mutex_init(&codec->control_mutex);
mutex_init(&codec->prepare_mutex);
init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info)); init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head)); init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32); snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
@ -1213,6 +1213,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
u32 stream_tag, u32 stream_tag,
int channel_id, int format) int channel_id, int format)
{ {
struct hda_codec *c;
struct hda_cvt_setup *p; struct hda_cvt_setup *p;
unsigned int oldval, newval; unsigned int oldval, newval;
int i; int i;
@ -1253,10 +1254,12 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
p->dirty = 0; p->dirty = 0;
/* make other inactive cvts with the same stream-tag dirty */ /* make other inactive cvts with the same stream-tag dirty */
for (i = 0; i < codec->cvt_setups.used; i++) { list_for_each_entry(c, &codec->bus->codec_list, list) {
p = snd_array_elem(&codec->cvt_setups, i); for (i = 0; i < c->cvt_setups.used; i++) {
if (!p->active && p->stream_tag == stream_tag) p = snd_array_elem(&c->cvt_setups, i);
p->dirty = 1; if (!p->active && p->stream_tag == stream_tag)
p->dirty = 1;
}
} }
} }
EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream); EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);
@ -1306,12 +1309,16 @@ static void really_cleanup_stream(struct hda_codec *codec,
/* clean up the all conflicting obsolete streams */ /* clean up the all conflicting obsolete streams */
static void purify_inactive_streams(struct hda_codec *codec) static void purify_inactive_streams(struct hda_codec *codec)
{ {
struct hda_codec *c;
int i; int i;
for (i = 0; i < codec->cvt_setups.used; i++) { list_for_each_entry(c, &codec->bus->codec_list, list) {
struct hda_cvt_setup *p = snd_array_elem(&codec->cvt_setups, i); for (i = 0; i < c->cvt_setups.used; i++) {
if (p->dirty) struct hda_cvt_setup *p;
really_cleanup_stream(codec, p); p = snd_array_elem(&c->cvt_setups, i);
if (p->dirty)
really_cleanup_stream(c, p);
}
} }
} }
@ -3502,11 +3509,11 @@ int snd_hda_codec_prepare(struct hda_codec *codec,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
int ret; int ret;
mutex_lock(&codec->prepare_mutex); mutex_lock(&codec->bus->prepare_mutex);
ret = hinfo->ops.prepare(hinfo, codec, stream, format, substream); ret = hinfo->ops.prepare(hinfo, codec, stream, format, substream);
if (ret >= 0) if (ret >= 0)
purify_inactive_streams(codec); purify_inactive_streams(codec);
mutex_unlock(&codec->prepare_mutex); mutex_unlock(&codec->bus->prepare_mutex);
return ret; return ret;
} }
EXPORT_SYMBOL_HDA(snd_hda_codec_prepare); EXPORT_SYMBOL_HDA(snd_hda_codec_prepare);
@ -3515,9 +3522,9 @@ void snd_hda_codec_cleanup(struct hda_codec *codec,
struct hda_pcm_stream *hinfo, struct hda_pcm_stream *hinfo,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
mutex_lock(&codec->prepare_mutex); mutex_lock(&codec->bus->prepare_mutex);
hinfo->ops.cleanup(hinfo, codec, substream); hinfo->ops.cleanup(hinfo, codec, substream);
mutex_unlock(&codec->prepare_mutex); mutex_unlock(&codec->bus->prepare_mutex);
} }
EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup); EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup);

2
sound/pci/hda/hda_codec.h
View File

@ -648,6 +648,7 @@ struct hda_bus {
struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1];
struct mutex cmd_mutex; struct mutex cmd_mutex;
struct mutex prepare_mutex;
/* unsolicited event queue */ /* unsolicited event queue */
struct hda_bus_unsolicited *unsol; struct hda_bus_unsolicited *unsol;
@ -826,7 +827,6 @@ struct hda_codec {
struct mutex spdif_mutex; struct mutex spdif_mutex;
struct mutex control_mutex; struct mutex control_mutex;
struct mutex prepare_mutex;
unsigned int spdif_status; /* IEC958 status bits */ unsigned int spdif_status; /* IEC958 status bits */
unsigned short spdif_ctls; /* SPDIF control bits */ unsigned short spdif_ctls; /* SPDIF control bits */
unsigned int spdif_in_enable; /* SPDIF input enable? */ unsigned int spdif_in_enable; /* SPDIF input enable? */