[Sound-open-firmware] [PATCH] topology: Remove unsupport multiple kcontrol for volume playback

[Pierre-Louis Bossart]

On 2/27/18 10:20 PM, Pan, Xiuli wrote:
> On 2/28/2018 13:20, Pierre-Louis Bossart wrote:
>> On 2/27/18 6:37 AM, Xiuli Pan wrote:
>>> From: Pan Xiuli <xiuli.pan at linux.intel.com>
>>>
>>> Now we did not support multiple kcontrol, remove the two kcontrol in
>>> volume playback template.
>>
>> Sorry, it's pretty common to use both volume and switch. Why not fix 
>> the issue instead of removing mute capabilities?
>>
> Yes, this is what Ranjani is doing.
> But this patch should go after the kernel patches are applied.
> Now we could not test with volume playback. And this should be with all 
> volume topology template but not only with playback one. This seems like 
> to be some test code.

I don't get your point.
If this is fixing a temporary issue due to some conflict with Ranjani's 
work then we should do things in the right order instead of disabling 
mutes to re-enable later.
I also don't see what kernel patches you are referring to.

> 
> Thanks
> Xiuli
>>>
>>> Signed-off-by: Pan Xiuli <xiuli.pan at linux.intel.com>
>>> ---
>>>   topology/sof/pipe-volume-playback.m4 | 28 +---------------------------
>>>   1 file changed, 1 insertion(+), 27 deletions(-)
>>>
>>> diff --git a/topology/sof/pipe-volume-playback.m4 
>>> b/topology/sof/pipe-volume-playback.m4
>>> index 8aa02fb..9ccc5da 100644
>>> --- a/topology/sof/pipe-volume-playback.m4
>>> +++ b/topology/sof/pipe-volume-playback.m4
>>> @@ -38,32 +38,6 @@ SectionControlMixer.STR(Master Playback Volume) {
>>>       tlv "vtlv_m90s3"
>>>   }
>>>   -SectionControlMixer.STR(Master Playback Volume Switch) {
>>> -
>>> -    # control belongs to this index group
>>> -    index STR(PIPELINE_ID)
>>> -
>>> -    # Channel register and shift for Front Left/Right
>>> -    channel."FL" {
>>> -        reg "1"
>>> -        shift "0"
>>> -    }
>>> -    channel."FR" {
>>> -        reg "1"
>>> -        shift "1"
>>> -    }
>>> -
>>> -    # control uses bespoke driver get/put/info ID 0
>>> -    ops."ctl" {
>>> -        info "volsw"
>>> -        get "256"
>>> -        put "256"
>>> -    }
>>> -
>>> -    # Volume mute on/off
>>> -    max "1"
>>> -    invert "false"
>>> -}
>>>   #
>>>   # Components and Buffers
>>>   #
>>> @@ -73,7 +47,7 @@ SectionControlMixer.STR(Master Playback Volume 
>>> Switch) {
>>>   W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, 
>>> PIPELINE_DMAC_CHAN, 2, 0, 2)
>>>     # "Volume" has 2 source and 2 sink periods
>>> -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume 
>>> Switch", "Master Playback Volume"))
>>> +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume"))
>>>     # Playback Buffers
>>>   W_BUFFER(0, COMP_BUFFER_SIZE(2,
>>>
>>
>> _______________________________________________
>> Sound-open-firmware mailing list
>> Sound-open-firmware at alsa-project.org
>> http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
>