From: Jeeja KP Subject: Re: [PATCH v2 05/13] ALSA: hda: check stream decoupled register state Date: Thu, 8 Dec 2016 12:01:12 +0530 Message-ID: <20161208063111.GA7931@kpjeeja-desk> 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by alsa0.perex.cz (Postfix) with ESMTP id 741D5267364 for ; Thu, 8 Dec 2016 07:20:56 +0100 (CET) Content-Disposition: inline In-Reply-To: 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: Takashi Iwai 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, Dec 07, 2016 at 02:41:59PM +0100, Takashi Iwai wrote: > 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. Yes, shift is superfluous here. I will fix this. > > > 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 > > --