Skip to content

topology: tgl-max98373-rt5682: adjust channel usage for sdw DSM support #2987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Jun 24, 2020
Merged

topology: tgl-max98373-rt5682: adjust channel usage for sdw DSM support #2987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions tools/topology/sof-tgl-sdw-max98373-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ define(`SMART_BE_ID', 2)
# Playback related
define(`SMART_PB_PPL_ID', 3)
define(`SMART_PB_CH_NUM', 2)
define(`SMART_TX_CHANNELS', 4)
define(`SMART_RX_CHANNELS', 8)
define(`SMART_FB_CHANNELS', 8)
# channel number for playback on sdw link
define(`SMART_TX_CHANNELS', 2)
# channel number for I/V feedback on sdw link
define(`SMART_RX_CHANNELS', 4)
# Smart_amp algorithm specific. channel number
# for feedback provided to smart_amp algorithm
define(`SMART_FB_CHANNELS', 4)

@plbossart plbossart May 28, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's still too much, we can only support 4 separate PCM transfers on a single link.

@RanderWang RanderWang May 29, 2020

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart I tested it on the TGL production. And 4 separate PCM transfers : two channels playback & two channels capture ? As you know, the channel number for capture is double size of playback for IV feedback.

@RanderWang RanderWang May 29, 2020

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart yes, it is impossible for 32bit * 6. 32bit PCM stream is used in DSM feature, but DAI config is set to 24bit (another story), so my PR works.

@plbossart plbossart May 29, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has nothing to do with bandwidth, word length or channel count. At the ALH level, we can only do 4 DMA transfers to/from PDI_BD PCM targets.

#define DAI_NUM_ALH_BI_DIR_LINKS_GROUP	6

static const uint8_t alh_handshake_map[64] = {
	-1,	/* 0  - INVALID */
	-1,	/* 1  - INVALID */
	-1,	/* 2  - INVALID */
	-1,	/* 3  - INVALID */
	-1,	/* 4  - INVALID */
	-1,	/* 5  - INVALID */
	-1,	/* 6  - INVALID */
	22,	/* 7  - BIDIRECTIONAL */
	23,	/* 8  - BIDIRECTIONAL */
	24,	/* 9  - BIDIRECTIONAL */
	25,	/* 10 - BIDIRECTIONAL */
	26,	/* 11 - BIDIRECTIONAL */
	27,	/* 12 - BIDIRECTIONAL */

We can only use e.g. 9..12 for PCM transfers. I am not sure how you managed to transfer 6 independent streams since it's not aligned with the documentation. Can you describe which ALH stream numbers you used?

@RanderWang RanderWang Jun 1, 2020

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart Iet's make it clear. There are only two PCMs in DSM feature: one is for playback (2ch) and another one is for capture (4ch).

@plbossart plbossart Jun 1, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was talking about ALH/DMA transfers of PCM data, your reply does not answer to my question.

@RanderWang RanderWang Jun 2, 2020 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart I don't need to transfer 6 independent streams, right ? There are only two streams, so 32, /* 23 - BIDIRECTIONAL / is used for playback and 33, / 24 - BIDIRECTIONAL */ is used for capture.

@RanderWang RanderWang Jun 2, 2020

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dumped the stream id in driver, 32 /* 23 - BIDIRECTIONAL / is used for playback and 33 /* 24 - BIDIRECTIONAL / is used for capture ( link1).

@lgirdwood lgirdwood Jun 16, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it now from the comments, best to say "FEEDBACK" instead of "FB" in the naming.

# Ref capture related
define(`SMART_REF_PPL_ID', 4)
define(`SMART_REF_CH_NUM', 4)
Expand Down