diff mbox

ASoC: Intel: kbl: Modify Headset map for Multi-Playback

Message ID 1509679697-22154-1-git-send-email-naveen.m@intel.com (mailing list archive)
State Accepted
Commit 4c761ebfcb2d04ee36783c4c8c45ae00caf59d36
Headers show

Commit Message

Naveen M Nov. 3, 2017, 3:28 a.m. UTC 
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(-)

Comments

Vinod Koul Nov. 3, 2017, 8:21 a.m. UTC | #1 
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
>
Naveen M Nov. 3, 2017, 8:48 a.m. UTC | #2 
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
Vinod Koul Nov. 3, 2017, 10:14 a.m. UTC | #3 
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
> 
> --
diff mbox

Patch

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" },