From: Takashi Iwai <tiwai@suse.de> To: Hsin-Yu Chao <hychao@chromium.org> Cc: linux-arm-kernel@lists.infradead.org, Jaroslav Kysela <perex@perex.cz>, Dylan Reid <dgreid@chromium.org>, Chih-Chung Chang <chihchung@chromium.org>, Xi Wang <xi.wang@gmail.com>, Ian Minett <ian_minett@creativelabs.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] ALSA: hda/ca0132 - setup/cleanup streams Date: Fri, 07 Feb 2014 11:59:20 +0100 [thread overview] Message-ID: <s5hvbwrtchj.wl%tiwai@suse.de> (raw) In-Reply-To: <1391744130-15043-1-git-send-email-hychao@chromium.org> At Fri, 7 Feb 2014 11:35:29 +0800, Hsin-Yu Chao wrote: > > 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: Hsin-Yu Chao <hychao@chromium.org> > Reviewed-by: Chih-Chung Chang <chihchung@chromium.org> Thanks, applied this one. Takashi > --- > sound/pci/hda/patch_ca0132.c | 68 ++++++-------------------------------------- > 1 file changed, 9 insertions(+), 59 deletions(-) > > diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c > index 54d1479..59104dc 100644 > --- a/sound/pci/hda/patch_ca0132.c > +++ b/sound/pci/hda/patch_ca0132.c > @@ -2662,60 +2662,6 @@ static bool dspload_wait_loaded(struct hda_codec *codec) > } > > /* > - * 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 > */ > static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, > @@ -2726,7 +2672,9 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, > { > struct ca0132_spec *spec = codec->spec; > > - ca0132_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); > + ca0132_toggle_dac_format(codec); > + > + snd_hda_codec_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); > > return 0; > } > @@ -2745,7 +2693,7 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, > if (spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]) > msleep(50); > > - ca0132_cleanup_stream(codec, spec->dacs[0]); > + snd_hda_codec_cleanup_stream(codec, spec->dacs[0]); > > return 0; > } > @@ -2824,8 +2772,8 @@ static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo, > { > struct ca0132_spec *spec = codec->spec; > > - ca0132_setup_stream(codec, spec->adcs[substream->number], > - stream_tag, 0, format); > + snd_hda_codec_setup_stream(codec, spec->adcs[substream->number], > + stream_tag, 0, format); > > return 0; > } > @@ -2839,7 +2787,7 @@ static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, > if (spec->dsp_state == DSP_DOWNLOADING) > return 0; > > - ca0132_cleanup_stream(codec, hinfo->nid); > + snd_hda_codec_cleanup_stream(codec, hinfo->nid); > return 0; > } > > @@ -4742,6 +4690,8 @@ static int patch_ca0132(struct hda_codec *codec) > return err; > > codec->patch_ops = ca0132_patch_ops; > + codec->pcm_format_first = 1; > + codec->no_sticky_stream = 1; > > return 0; > } > -- > 1.9.0.rc1.175.g0b1dcb5 >
WARNING: multiple messages have this Message-ID (diff)
From: tiwai@suse.de (Takashi Iwai) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] ALSA: hda/ca0132 - setup/cleanup streams Date: Fri, 07 Feb 2014 11:59:20 +0100 [thread overview] Message-ID: <s5hvbwrtchj.wl%tiwai@suse.de> (raw) In-Reply-To: <1391744130-15043-1-git-send-email-hychao@chromium.org> At Fri, 7 Feb 2014 11:35:29 +0800, Hsin-Yu Chao wrote: > > 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: Hsin-Yu Chao <hychao@chromium.org> > Reviewed-by: Chih-Chung Chang <chihchung@chromium.org> Thanks, applied this one. Takashi > --- > sound/pci/hda/patch_ca0132.c | 68 ++++++-------------------------------------- > 1 file changed, 9 insertions(+), 59 deletions(-) > > diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c > index 54d1479..59104dc 100644 > --- a/sound/pci/hda/patch_ca0132.c > +++ b/sound/pci/hda/patch_ca0132.c > @@ -2662,60 +2662,6 @@ static bool dspload_wait_loaded(struct hda_codec *codec) > } > > /* > - * 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 > */ > static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, > @@ -2726,7 +2672,9 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, > { > struct ca0132_spec *spec = codec->spec; > > - ca0132_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); > + ca0132_toggle_dac_format(codec); > + > + snd_hda_codec_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); > > return 0; > } > @@ -2745,7 +2693,7 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, > if (spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]) > msleep(50); > > - ca0132_cleanup_stream(codec, spec->dacs[0]); > + snd_hda_codec_cleanup_stream(codec, spec->dacs[0]); > > return 0; > } > @@ -2824,8 +2772,8 @@ static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo, > { > struct ca0132_spec *spec = codec->spec; > > - ca0132_setup_stream(codec, spec->adcs[substream->number], > - stream_tag, 0, format); > + snd_hda_codec_setup_stream(codec, spec->adcs[substream->number], > + stream_tag, 0, format); > > return 0; > } > @@ -2839,7 +2787,7 @@ static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, > if (spec->dsp_state == DSP_DOWNLOADING) > return 0; > > - ca0132_cleanup_stream(codec, hinfo->nid); > + snd_hda_codec_cleanup_stream(codec, hinfo->nid); > return 0; > } > > @@ -4742,6 +4690,8 @@ static int patch_ca0132(struct hda_codec *codec) > return err; > > codec->patch_ops = ca0132_patch_ops; > + codec->pcm_format_first = 1; > + codec->no_sticky_stream = 1; > > return 0; > } > -- > 1.9.0.rc1.175.g0b1dcb5 >
next prev parent reply other threads:[~2014-02-07 10:59 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-07 3:35 [PATCH 1/2] ALSA: hda/ca0132 - setup/cleanup streams Hsin-Yu Chao 2014-02-07 3:35 ` Hsin-Yu Chao 2014-02-07 3:35 ` Hsin-Yu Chao 2014-02-07 3:35 ` [PATCH 2/2] ALSA: hda/ca0132 - Fix recording from mode id 0x8 Hsin-Yu Chao 2014-02-07 3:35 ` Hsin-Yu Chao 2014-02-07 11:05 ` Takashi Iwai 2014-02-07 11:05 ` Takashi Iwai 2014-02-19 6:30 ` Hsin-Yu Chao 2014-02-19 6:30 ` Hsin-Yu Chao 2014-02-19 6:30 ` Hsin-Yu Chao 2014-02-07 10:59 ` Takashi Iwai [this message] 2014-02-07 10:59 ` [PATCH 1/2] ALSA: hda/ca0132 - setup/cleanup streams Takashi Iwai 2014-02-07 11:12 ` Takashi Iwai 2014-02-07 11:12 ` Takashi Iwai 2014-02-19 6:27 ` Hsin-Yu Chao 2014-02-19 6:27 ` Hsin-Yu Chao 2014-02-19 6:27 ` Hsin-Yu Chao 2014-02-19 6:51 ` Takashi Iwai 2014-02-19 6:51 ` Takashi Iwai 2014-02-19 6:51 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=s5hvbwrtchj.wl%tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ --cc=chihchung@chromium.org \ --cc=dgreid@chromium.org \ --cc=hychao@chromium.org \ --cc=ian_minett@creativelabs.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=xi.wang@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.