From: Takashi Iwai Subject: Re: [PATCH v2 05/13] ALSA: hda: check stream decoupled register state Date: Wed, 07 Dec 2016 14:41:59 +0100 Message-ID: References: <1481118275-30715-1-git-send-email-jeeja.kp@intel.com> <1481118275-30715-6-git-send-email-jeeja.kp@intel.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 96BD426699F for ; Wed, 7 Dec 2016 14:42:02 +0100 (CET) In-Reply-To: <1481118275-30715-6-git-send-email-jeeja.kp@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: jeeja.kp@intel.com Cc: patches.audio@intel.com, alsa-devel@alsa-project.org, broonie@kernel.org, liam.r.girdwood@intel.com List-Id: alsa-devel@alsa-project.org On Wed, 07 Dec 2016 14:44:27 +0100, jeeja.kp@intel.com wrote: > > From: Jeeja KP > > Check stream decoupled register value with requested value > before decoupling/coupling the stream. > > Signed-off-by: Jeeja KP > --- > sound/hda/ext/hdac_ext_stream.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c > index 3be051a..f35b006 100644 > --- a/sound/hda/ext/hdac_ext_stream.c > +++ b/sound/hda/ext/hdac_ext_stream.c > @@ -128,14 +128,17 @@ void snd_hdac_ext_stream_decouple(struct hdac_ext_bus *ebus, > { > struct hdac_stream *hstream = &stream->hstream; > struct hdac_bus *bus = &ebus->bus; > + u32 val; > + int mask = AZX_PPCTL_PROCEN(hstream->index); > > spin_lock_irq(&bus->reg_lock); > - if (decouple) > - snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, 0, > - AZX_PPCTL_PROCEN(hstream->index)); > - else > - snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, > - AZX_PPCTL_PROCEN(hstream->index), 0); > + val = ((readw(bus->ppcap + AZX_REG_PP_PPCTL) & mask) >> mask); This looks wrong. And you just need to know whether it's zero or not in below, so the shift is anyway superfluous. Takashi > + if (decouple && (val == 0)) > + snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, mask); > + else if (!decouple && (val > 0)) > + snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, 0); > + > stream->decoupled = decouple; > spin_unlock_irq(&bus->reg_lock); > } > -- > 2.5.0 >