Skip to content
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.

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

vc4/drm: Adjustments to hdmi audio dma to reduce glitches #4208

Merged
merged 2 commits into from
Mar 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2711-rpi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
};

&hdmi0 {
dmas = <&dma (10|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
dmas = <&dma (10|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
status = "disabled";
};

Expand All @@ -188,7 +188,7 @@
};

&hdmi1 {
dmas = <&dma (17|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
dmas = <&dma (17|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
status = "disabled";
};

Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1614,10 +1614,10 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,

/* Set the MAI threshold */
HDMI_WRITE(HDMI_MAI_THR,
VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) |
VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) |
VC4_SET_FIELD(0x06, VC4_HD_MAI_THR_DREQHIGH) |
VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW));

HDMI_WRITE(HDMI_MAI_CONFIG,
VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
Expand Down