[PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[Naveen Manohar]

Current topology for Headset resulted in unwanted pop noise,
while switching from spk->hs at the start of Headset Playback.
Modified topology to fix the same.
This modification also requires headset route to be updated.

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
---
 sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index 6f9a8bc..6dcad0a 100644
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -101,7 +101,7 @@ enum {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 6072164..271ae3c 100644
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -109,7 +109,7 @@ enum {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
-- 
1.9.1

Re: [PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[Vinod Koul]

On Fri, Nov 03, 2017 at 08:58:17AM +0530, Naveen Manohar wrote:
> Current topology for Headset resulted in unwanted pop noise,
> while switching from spk->hs at the start of Headset Playback.

what is the reason for the pop ?

> Modified topology to fix the same.

how does that fix it, sorry am quite unclear about that part

> This modification also requires headset route to be updated.

that seems to be the only change here, so not sure I follow the changes dont
for this

> 
> Signed-off-by: Naveen Manohar <naveen.m@intel.com>
> Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
> ---
>  sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
>  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> index 6f9a8bc..6dcad0a 100644
> --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> @@ -101,7 +101,7 @@ enum {
>  	{ "ssp0 Tx", NULL, "spk_out" },
>  
>  	{ "AIF Playback", NULL, "ssp1 Tx" },
> -	{ "ssp1 Tx", NULL, "hs_out" },
> +	{ "ssp1 Tx", NULL, "codec1_out" },
>  
>  	{ "hs_in", NULL, "ssp1 Rx" },
>  	{ "ssp1 Rx", NULL, "AIF Capture" },
> diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> index 6072164..271ae3c 100644
> --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> @@ -109,7 +109,7 @@ enum {
>  	{ "ssp0 Tx", NULL, "spk_out" },
>  
>  	{ "AIF Playback", NULL, "ssp1 Tx" },
> -	{ "ssp1 Tx", NULL, "hs_out" },
> +	{ "ssp1 Tx", NULL, "codec1_out" },
>  
>  	{ "hs_in", NULL, "ssp1 Rx" },
>  	{ "ssp1 Rx", NULL, "AIF Capture" },
> -- 
> 1.9.1
> 

-- 
~Vinod

Re: [PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[Naveen M]

On Fri, Nov 03, 2017 at 01:51:00PM +0530, Vinod Koul wrote:
> On Fri, Nov 03, 2017 at 08:58:17AM +0530, Naveen Manohar wrote:
> > Current topology for Headset resulted in unwanted pop noise,
> > while switching from spk->hs at the start of Headset Playback.
> 
> what is the reason for the pop ?
> 
There is an artifact observed at the start of the stream, which is not
seen earlier with mixin-mixout dsp module, through which data was
passing-through.

> > Modified topology to fix the same.
> 
> how does that fix it, sorry am quite unclear about that part
> 
Only for headset playback pipe, we re-introduced the mixin-mixout which
was there earlier. This does not fix the problem but removes regression
(pop-noise in headset playback) introduced by earlier
commit-ID:0b06122fc8d0949a0aa7b817d98e031104802611

> > This modification also requires headset route to be updated.
> 
> that seems to be the only change here, so not sure I follow the changes dont
> for this
>
As the topology was modified to earlier path, earlier route change was
reverted for headset playback.

> > 
> > Signed-off-by: Naveen Manohar <naveen.m@intel.com>
> > Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
> > ---
> >  sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
> >  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > index 6f9a8bc..6dcad0a 100644
> > --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > @@ -101,7 +101,7 @@ enum {
> >  	{ "ssp0 Tx", NULL, "spk_out" },
> >  
> >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > -	{ "ssp1 Tx", NULL, "hs_out" },
> > +	{ "ssp1 Tx", NULL, "codec1_out" },
> >  
> >  	{ "hs_in", NULL, "ssp1 Rx" },
> >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > index 6072164..271ae3c 100644
> > --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > @@ -109,7 +109,7 @@ enum {
> >  	{ "ssp0 Tx", NULL, "spk_out" },
> >  
> >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > -	{ "ssp1 Tx", NULL, "hs_out" },
> > +	{ "ssp1 Tx", NULL, "codec1_out" },
> >  
> >  	{ "hs_in", NULL, "ssp1 Rx" },
> >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > -- 
> > 1.9.1
> > 
> 
> -- 
> ~Vinod

-- 

Re: [alsa-devel] [PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[Naveen M]

On Fri, Nov 03, 2017 at 01:51:00PM +0530, Vinod Koul wrote:
> On Fri, Nov 03, 2017 at 08:58:17AM +0530, Naveen Manohar wrote:
> > Current topology for Headset resulted in unwanted pop noise,
> > while switching from spk->hs at the start of Headset Playback.
> 
> what is the reason for the pop ?
> 
There is an artifact observed at the start of the stream, which is not
seen earlier with mixin-mixout dsp module, through which data was
passing-through.

> > Modified topology to fix the same.
> 
> how does that fix it, sorry am quite unclear about that part
> 
Only for headset playback pipe, we re-introduced the mixin-mixout which
was there earlier. This does not fix the problem but removes regression
(pop-noise in headset playback) introduced by earlier
commit-ID:0b06122fc8d0949a0aa7b817d98e031104802611

> > This modification also requires headset route to be updated.
> 
> that seems to be the only change here, so not sure I follow the changes dont
> for this
>
As the topology was modified to earlier path, earlier route change was
reverted for headset playback.

> > 
> > Signed-off-by: Naveen Manohar <naveen.m@intel.com>
> > Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
> > ---
> >  sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
> >  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > index 6f9a8bc..6dcad0a 100644
> > --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > @@ -101,7 +101,7 @@ enum {
> >  	{ "ssp0 Tx", NULL, "spk_out" },
> >  
> >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > -	{ "ssp1 Tx", NULL, "hs_out" },
> > +	{ "ssp1 Tx", NULL, "codec1_out" },
> >  
> >  	{ "hs_in", NULL, "ssp1 Rx" },
> >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > index 6072164..271ae3c 100644
> > --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > @@ -109,7 +109,7 @@ enum {
> >  	{ "ssp0 Tx", NULL, "spk_out" },
> >  
> >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > -	{ "ssp1 Tx", NULL, "hs_out" },
> > +	{ "ssp1 Tx", NULL, "codec1_out" },
> >  
> >  	{ "hs_in", NULL, "ssp1 Rx" },
> >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > -- 
> > 1.9.1
> > 
> 
> -- 
> ~Vinod

-- 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Intel: kbl: Modify Headset map for Multi-Playback

[Vinod Koul]

On Fri, Nov 03, 2017 at 02:18:34PM +0530, Naveen M wrote:
> On Fri, Nov 03, 2017 at 01:51:00PM +0530, Vinod Koul wrote:
> > On Fri, Nov 03, 2017 at 08:58:17AM +0530, Naveen Manohar wrote:
> > > Current topology for Headset resulted in unwanted pop noise,
> > > while switching from spk->hs at the start of Headset Playback.
> > 
> > what is the reason for the pop ?
> > 
> There is an artifact observed at the start of the stream, which is not
> seen earlier with mixin-mixout dsp module, through which data was
> passing-through.
> 
> > > Modified topology to fix the same.
> > 
> > how does that fix it, sorry am quite unclear about that part
> > 
> Only for headset playback pipe, we re-introduced the mixin-mixout which
> was there earlier. This does not fix the problem but removes regression
> (pop-noise in headset playback) introduced by earlier
> commit-ID:0b06122fc8d0949a0aa7b817d98e031104802611

Then please mention that in the log. IIUC you should say it fixes the wrong
path in commit 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for
Multi-Playback & Echo Ref") which resulted in pop noise.

> 
> > > This modification also requires headset route to be updated.
> > 
> > that seems to be the only change here, so not sure I follow the changes dont
> > for this
> >
> As the topology was modified to earlier path, earlier route change was
> reverted for headset playback.
> 
> > > 
> > > Signed-off-by: Naveen Manohar <naveen.m@intel.com>
> > > Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
> > > ---
> > >  sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
> > >  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > > index 6f9a8bc..6dcad0a 100644
> > > --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > > +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > > @@ -101,7 +101,7 @@ enum {
> > >  	{ "ssp0 Tx", NULL, "spk_out" },
> > >  
> > >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > > -	{ "ssp1 Tx", NULL, "hs_out" },
> > > +	{ "ssp1 Tx", NULL, "codec1_out" },
> > >  
> > >  	{ "hs_in", NULL, "ssp1 Rx" },
> > >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > > diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > > index 6072164..271ae3c 100644
> > > --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > > +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> > > @@ -109,7 +109,7 @@ enum {
> > >  	{ "ssp0 Tx", NULL, "spk_out" },
> > >  
> > >  	{ "AIF Playback", NULL, "ssp1 Tx" },
> > > -	{ "ssp1 Tx", NULL, "hs_out" },
> > > +	{ "ssp1 Tx", NULL, "codec1_out" },
> > >  
> > >  	{ "hs_in", NULL, "ssp1 Rx" },
> > >  	{ "ssp1 Rx", NULL, "AIF Capture" },
> > > -- 
> > > 1.9.1
> > > 
> > 
> > -- 
> > ~Vinod
> 
> -- 

-- 
~Vinod

Applied "ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise" to the asoc tree

[Mark Brown]

The patch

   ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 4c761ebfcb2d04ee36783c4c8c45ae00caf59d36 Mon Sep 17 00:00:00 2001
From: Naveen Manohar <naveen.m@intel.com>
Date: Fri, 3 Nov 2017 19:15:02 +0530
Subject: [PATCH] ASoC: Intel: kbl: Modify map for Headset Playback to fix
 pop-noise

Patch fixes wrong path in commit 0b06122fc8d0 ("ASoC: Intel: kbl: Add
map for new DAIs for Multi-Playback & Echo Ref") which resulted in pop
noise.
Current topology for Headset results in unwanted pop noise, while
switching from spk->hs at the start of Headset Playback.
Hence re-introduced mixin-mixout dsp module in topology for headset
playback pipe to fix the regression.
And the corresponding modification for headset route is updated here.

Fixes: 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for
Multi-Playback & Echo Ref")
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index 6f9a8bcf20f3..6dcad0a8a0d0 100644
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -101,7 +101,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 6072164f2d43..271ae3c2c535 100644
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -109,7 +109,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
-- 
2.14.1