Commit 28fba950 authored by Hsin-Yu Chao's avatar Hsin-Yu Chao Committed by Takashi Iwai

ALSA: hda/ca0132 - setup/cleanup streams

When a HDMI stream is opened with the same stream tag
as a following opened stream to ca0132, audio will be
heard from two ports simultaneously.
Fix this issue by change to use snd_hda_codec_setup_stream
and snd_hda_codec_cleanup_stream instead, so that an
inactive stream can be marked as 'dirty' when found
with a conflict stream tag, and then get purified.
Signed-off-by: default avatarHsin-Yu Chao <hychao@chromium.org>
Reviewed-by: default avatarChih-Chung Chang <chihchung@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4913e0bf
...@@ -2661,60 +2661,6 @@ static bool dspload_wait_loaded(struct hda_codec *codec) ...@@ -2661,60 +2661,6 @@ static bool dspload_wait_loaded(struct hda_codec *codec)
return false; return false;
} }
/*
* PCM stuffs
*/
static void ca0132_setup_stream(struct hda_codec *codec, hda_nid_t nid,
u32 stream_tag,
int channel_id, int format)
{
unsigned int oldval, newval;
if (!nid)
return;
snd_printdd(
"ca0132_setup_stream: NID=0x%x, stream=0x%x, "
"channel=%d, format=0x%x\n",
nid, stream_tag, channel_id, format);
/* update the format-id if changed */
oldval = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_STREAM_FORMAT,
0);
if (oldval != format) {
msleep(20);
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_STREAM_FORMAT,
format);
}
oldval = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
newval = (stream_tag << 4) | channel_id;
if (oldval != newval) {
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CHANNEL_STREAMID,
newval);
}
}
static void ca0132_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
{
unsigned int val;
if (!nid)
return;
snd_printdd(KERN_INFO "ca0132_cleanup_stream: NID=0x%x\n", nid);
val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
if (!val)
return;
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);
}
/* /*
* PCM callbacks * PCM callbacks
*/ */
...@@ -2726,7 +2672,7 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, ...@@ -2726,7 +2672,7 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
ca0132_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); snd_hda_codec_setup_stream(codec, spec->dacs[0], stream_tag, 0, format);
return 0; return 0;
} }
...@@ -2745,7 +2691,7 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, ...@@ -2745,7 +2691,7 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
if (spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]) if (spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID])
msleep(50); msleep(50);
ca0132_cleanup_stream(codec, spec->dacs[0]); snd_hda_codec_cleanup_stream(codec, spec->dacs[0]);
return 0; return 0;
} }
...@@ -2824,8 +2770,8 @@ static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo, ...@@ -2824,8 +2770,8 @@ static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
ca0132_setup_stream(codec, spec->adcs[substream->number], snd_hda_codec_setup_stream(codec, spec->adcs[substream->number],
stream_tag, 0, format); stream_tag, 0, format);
return 0; return 0;
} }
...@@ -2839,7 +2785,7 @@ static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, ...@@ -2839,7 +2785,7 @@ static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
if (spec->dsp_state == DSP_DOWNLOADING) if (spec->dsp_state == DSP_DOWNLOADING)
return 0; return 0;
ca0132_cleanup_stream(codec, hinfo->nid); snd_hda_codec_cleanup_stream(codec, hinfo->nid);
return 0; return 0;
} }
...@@ -4742,6 +4688,8 @@ static int patch_ca0132(struct hda_codec *codec) ...@@ -4742,6 +4688,8 @@ static int patch_ca0132(struct hda_codec *codec)
return err; return err;
codec->patch_ops = ca0132_patch_ops; codec->patch_ops = ca0132_patch_ops;
codec->pcm_format_first = 1;
codec->no_sticky_stream = 1;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment