46 lines
2.1 KiB
Diff
46 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
|
Date: Wed, 24 Sep 2025 15:48:39 +0800
|
|
Subject: drm/display: add hw_params callback function to
|
|
drm_connector_hdmi_audio_ops
|
|
|
|
After reusing drm_hdmi_audio_* helpers and drm_bridge_connector
|
|
integration in drm/msm/dp, we have dropped msm_dp_audio_hw_params and
|
|
use msm_dp_audio_prepare instead. While userspace is still calling
|
|
hw_params to do audio initialization, and we get the following errors:
|
|
|
|
[ 784.904566] qcom-apm gprsvc:service:2:1: Error (1) Processing 0x01001002 cmd
|
|
[ 784.912185] qcom-apm gprsvc:service:2:1: DSP returned error[1001002] 1
|
|
[ 784.918927] q6apm-lpass-dais 3700000.remoteproc:glink-edge:gpr:service@1:bedais: Failed to start APM port 104
|
|
[ 784.929947] q6apm-lpass-dais 3700000.remoteproc:glink-edge:gpr:service@1:bedais: ASoC error (-22): at snd_soc_dai_prepare() on DISPLAY_PORT_RX_0
|
|
|
|
msm_dp_audio_prepare is not called because hdmi-codec driver only checks
|
|
and runs hw_params. This commit will add hw_params callback function
|
|
same as drm_connector_hdmi_audio_prepare, so that hdmi-codec driver can
|
|
work with userspace alsa.
|
|
|
|
Tested with Radxa Dragon Q6A.
|
|
|
|
Fixes: 98a8920e7b07 ("drm/msm/dp: reuse generic HDMI codec implementation")
|
|
|
|
Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
|
|
---
|
|
drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
|
|
+++ b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
|
|
@@ -129,6 +129,7 @@ EXPORT_SYMBOL(drm_connector_hdmi_audio_plugged_notify);
|
|
|
|
static const struct hdmi_codec_ops drm_connector_hdmi_audio_ops = {
|
|
.audio_startup = drm_connector_hdmi_audio_startup,
|
|
+ .hw_params = drm_connector_hdmi_audio_prepare,
|
|
.prepare = drm_connector_hdmi_audio_prepare,
|
|
.audio_shutdown = drm_connector_hdmi_audio_shutdown,
|
|
.mute_stream = drm_connector_hdmi_audio_mute_stream,
|
|
--
|
|
Armbian
|
|
|