Skip to content

RTNR: Decouple switch-enable control from params blob#5768

Merged
mwasko merged 1 commit into
thesofproject:adl-004-drop-stablefrom
MingJenTai:adl-004-drop-stable_RTNR_fix_control_switch
May 27, 2022
Merged

RTNR: Decouple switch-enable control from params blob#5768
mwasko merged 1 commit into
thesofproject:adl-004-drop-stablefrom
MingJenTai:adl-004-drop-stable_RTNR_fix_control_switch

Conversation

@MingJenTai
Copy link
Copy Markdown
Contributor

This PR is based on #5616

It decouples the switch-typed control for enabling/disabling from the control bytes.

Previously, control blobs should be sent from userspace to to toggle RTNR on/off.
With this PR, RTNR can be toggled by setting the UCM switch value.

cset "name='RTNR10.0 rtnr_enable_10' off"
cset "name='RTNR10.0 rtnr_enable_10' on"

or from command line

amixer -c0 cset name='RTNR10.0 rtnr_enable_10' 1
amixer -c0 cget name='RTNR10.0 rtnr_enable_10' 0

Signed-off-by: Pin-chih Lin johnylin@google.com
Signed-off-by: Ming Jen Tai mingjen_tai@realtek.com

Cherry-picked from 2e6bfbe

@lgirdwood
Copy link
Copy Markdown
Member

SOFCI TEST

@lgirdwood
Copy link
Copy Markdown
Member

Rerun CI as there were some recent build fixes merged for Zephyr update.

@lgirdwood
Copy link
Copy Markdown
Member

Try ci again.

@lgirdwood
Copy link
Copy Markdown
Member

@marc-hb Zephyr build reporting the toolchain is not found. Do we need to rebase and force push to correct this ?

@gkbldcig
Copy link
Copy Markdown
Collaborator

Can one of the admins verify this patch?

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented May 16, 2022

@marc-hb Zephyr build reporting the toolchain is not found. Do we need to rebase and force push to correct this ?

You never need to rebase. Most common CI misconception. All CI engines used here do a git merge with the (moving!) target branch before testing.

What you need is my brand new

AFTER #5831 is approved and merged then a simple and empty git commit --amend -C HEAD here + force push should do.

@lgirdwood
Copy link
Copy Markdown
Member

AFTER #5831 is approved and merged then a simple and empty git commit --amend -C HEAD here + force push should do.

@MingJenTai #5381 is merged now so pls do above. Thanks.

@MingJenTai MingJenTai force-pushed the adl-004-drop-stable_RTNR_fix_control_switch branch from 178336d to 62ac80e Compare May 19, 2022 01:28
This PR is based on thesofproject#5616

It decouples the switch-typed control for enabling/disabling from the
control bytes.

Previously, control blobs should be sent from userspace to to toggle
RTNR on/off.
With this PR, RTNR can be toggled by setting the UCM switch value.

cset "name='RTNR10.0 rtnr_enable_10' off"
cset "name='RTNR10.0 rtnr_enable_10' on"

or from command line

amixer -c0 cset name='RTNR10.0 rtnr_enable_10' 1
amixer -c0 cget name='RTNR10.0 rtnr_enable_10' 0

Signed-off-by: Pin-chih Lin <johnylin@google.com>
Signed-off-by: Ming Jen Tai <mingjen_tai@realtek.com>

merge copy_func

Cherry-picked from 2e6bfbe
@MingJenTai MingJenTai force-pushed the adl-004-drop-stable_RTNR_fix_control_switch branch from 62ac80e to 8bef242 Compare May 19, 2022 01:32
@MingJenTai
Copy link
Copy Markdown
Contributor Author

AFTER #5831 is approved and merged then a simple and empty git commit --amend -C HEAD here + force push should do.

@MingJenTai #5381 is merged now so pls do above. Thanks.

@lgirdwood Done. Please check if this works. Thanks.

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented May 19, 2022

Zephyr builds on Github are now fixed as expected https://github.com/thesofproject/sof/runs/6499676276?check_suite_focus=true

The Zephyr builds on sof-ci/jenkins are still broken as expected because of known internal issue 215 (sof-ci/jenkins always overrides the default Zephyr version/branch with Zephyr main)

Similar problem with https://sof-ci.01.org/sof-pr-viewer/#/build/PR5768/build9374092 which requires some recent IPC4 stuff not on this branch.

@lgirdwood
Copy link
Copy Markdown
Member

Retry CI with recent fixes.

@lgirdwood
Copy link
Copy Markdown
Member

SOFCI TEST

@lgirdwood
Copy link
Copy Markdown
Member

@mwasko fyi non topology backport for ADL 04. CI does not work for some older branches. Ples review/merge as you see fit.

@mwasko
Copy link
Copy Markdown
Contributor

mwasko commented May 26, 2022

@mwasko fyi non topology backport for ADL 04. CI does not work for some older branches. Ples review/merge as you see fit.

@MingJenTai can you confirm that this changes was verified on this branch?

@MingJenTai
Copy link
Copy Markdown
Contributor Author

@mwasko fyi non topology backport for ADL 04. CI does not work for some older branches. Ples review/merge as you see fit.

@MingJenTai can you confirm that this changes was verified on this branch?

Yes this has been tested and verified on this branch, thank you!

@mwasko mwasko merged commit 8322e65 into thesofproject:adl-004-drop-stable May 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants