Message ID | 20180725005055.18138-2-pierre-louis.bossart@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Enable HDA Codec support on Intel Platforms | expand |
On 24-07-18, 19:50, Pierre-Louis Bossart wrote: > From: Rakesh Ughreja <rakesh.a.ughreja@intel.com> > > include DAPM Mux and output widgets into the list. Pierre, Curious how is this a fix? > > Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja@intel.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/skylake/skl-topology.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c > index 76dde12cc2bb..2620d77729c5 100644 > --- a/sound/soc/intel/skylake/skl-topology.c > +++ b/sound/soc/intel/skylake/skl-topology.c > @@ -108,6 +108,9 @@ static int is_skl_dsp_widget_type(struct snd_soc_dapm_widget *w, > case snd_soc_dapm_aif_out: > case snd_soc_dapm_dai_out: > case snd_soc_dapm_switch: > + case snd_soc_dapm_output: > + case snd_soc_dapm_mux: > + > return false; > default: > return true; > -- > 2.14.1
On 7/25/18 5:59 AM, Vinod wrote: > On 24-07-18, 19:50, Pierre-Louis Bossart wrote: >> From: Rakesh Ughreja <rakesh.a.ughreja@intel.com> >> >> include DAPM Mux and output widgets into the list. > > Pierre, > > Curious how is this a fix? This is Skylake-specific topology black magic that you are probably better equiped to understand that me... This just takes out the outputs and mux from a number of topology handling cases. > >> >> Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja@intel.com> >> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> >> --- >> sound/soc/intel/skylake/skl-topology.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c >> index 76dde12cc2bb..2620d77729c5 100644 >> --- a/sound/soc/intel/skylake/skl-topology.c >> +++ b/sound/soc/intel/skylake/skl-topology.c >> @@ -108,6 +108,9 @@ static int is_skl_dsp_widget_type(struct snd_soc_dapm_widget *w, >> case snd_soc_dapm_aif_out: >> case snd_soc_dapm_dai_out: >> case snd_soc_dapm_switch: >> + case snd_soc_dapm_output: >> + case snd_soc_dapm_mux: >> + >> return false; >> default: >> return true; >> -- >> 2.14.1 >
On 25-07-18, 09:04, Pierre-Louis Bossart wrote: > On 7/25/18 5:59 AM, Vinod wrote: > > On 24-07-18, 19:50, Pierre-Louis Bossart wrote: > > > From: Rakesh Ughreja <rakesh.a.ughreja@intel.com> > > > > > > include DAPM Mux and output widgets into the list. > > > > Pierre, > > > > Curious how is this a fix? > > This is Skylake-specific topology black magic that you are probably better > equiped to understand that me... This just takes out the outputs and mux > from a number of topology handling cases. :D I agree with the change. But it is not a fix.. So "Add additional widget handling" would be a better title. Fix is used for bugs and should be applied to next -rc.
>>>> include DAPM Mux and output widgets into the list. >>> >>> Pierre, >>> >>> Curious how is this a fix? >> >> This is Skylake-specific topology black magic that you are probably better >> equiped to understand that me... This just takes out the outputs and mux >> from a number of topology handling cases. > > :D > > I agree with the change. But it is not a fix.. So "Add additional widget > handling" would be a better title. > > Fix is used for bugs and should be applied to next -rc. ok, will change.
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 76dde12cc2bb..2620d77729c5 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -108,6 +108,9 @@ static int is_skl_dsp_widget_type(struct snd_soc_dapm_widget *w, case snd_soc_dapm_aif_out: case snd_soc_dapm_dai_out: case snd_soc_dapm_switch: + case snd_soc_dapm_output: + case snd_soc_dapm_mux: + return false; default: return true;