Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

topology: whl: refine bit depth setting for ALC700 #121

Closed
RanderWang wants to merge 1 commit into from
Closed

topology: whl: refine bit depth setting for ALC700 #121

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
56 changes: 28 additions & 28 deletions topology/sof-whl-hda.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,99 +27,99 @@ include(`platform/intel/bxt.m4')
# PCM5 ----> passthrough (pipe 9) -----> iDisp3 (HDMI/DP playback, BE link 5)
#

# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
1, 0, 2, s32le,
1, 0, 2, s16le,

@lgirdwood lgirdwood Nov 8, 2018

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.

we should really have a volume control for all HDMI outputs (this will also convert 32 to 24bit - dont use 16 when 24 is available)

@RanderWang RanderWang Nov 9, 2018 •
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.

ok. I will talk with customer whether they need a volume component.
And if they need, sof-hda-generic.m4 is ready for them

@RanderWang RanderWang Nov 9, 2018

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 would reserve this PR, because it is in release note for customer.
And I would send another PR for WHL after discussing with customer.

48, 1000, 0, 0)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
2, 0, 2, s32le,
2, 0, 2, s16le,
48, 1000, 0, 0)

# Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s32le.
# Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
3, 1, 2, s32le,
3, 1, 2, s16le,
48, 1000, 0, 0)

# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s32le.
# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
4, 1, 2, s32le,
4, 1, 2, s16le,
48, 1000, 0, 0)

# Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s32le.
# Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
7, 3, 2, s32le,
7, 3, 2, s16le,
48, 1000, 0, 0)

# Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s32le.
# Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
8, 4, 2, s32le,
8, 4, 2, s16le,
48, 1000, 0, 0)

# Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s32le.
# Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
9, 5, 2, s32le,
9, 5, 2, s16le,
48, 1000, 0, 0)

#
# DAIs configuration
#

# playback DAI is HDA Analog using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
1, HDA, 0, Analog Playback and Capture,
PIPELINE_SOURCE_1, 2, s32le,
PIPELINE_SOURCE_1, 2, s16le,
48, 1000, 0, 0)

# capture DAI is HDA Analog using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
2, HDA, 0, Analog Playback and Capture,
PIPELINE_SINK_2, 2, s32le,
PIPELINE_SINK_2, 2, s16le,
48, 1000, 0, 0)

# playback DAI is HDA Digital using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
3, HDA, 1, Digital Playback and Capture,
PIPELINE_SOURCE_3, 2, s32le,
PIPELINE_SOURCE_3, 2, s16le,
48, 1000, 0, 0)

# capture DAI is HDA Digital using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
4, HDA, 1, Digital Playback and Capture,
PIPELINE_SINK_4, 2, s32le,
PIPELINE_SINK_4, 2, s16le,
48, 1000, 0, 0)

# playback DAI is iDisp1 using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
7, HDA, 3, iDisp1,
PIPELINE_SOURCE_7, 2, s32le,
PIPELINE_SOURCE_7, 2, s16le,
48, 1000, 0, 0)

# playback DAI is iDisp2 using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
8, HDA, 4, iDisp2,
PIPELINE_SOURCE_8, 2, s32le,
PIPELINE_SOURCE_8, 2, s16le,
48, 1000, 0, 0)

# playback DAI is iDisp3 using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
9, HDA, 5, iDisp3,
PIPELINE_SOURCE_9, 2, s32le,
PIPELINE_SOURCE_9, 2, s16le,
48, 1000, 0, 0)

PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
Expand Down