diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2025-07-15 18:34:10 +0300 |
|---|---|---|
| committer | Chen-Yu Tsai <wens@csie.org> | 2025-07-15 18:34:10 +0300 |
| commit | ca5ad734d30f30a577f705926d6e16a87513a2a7 (patch) | |
| tree | b5fb169a86ac59892bd3b60c2df13e8a7cef360d /drivers/gpu/drm/vc4/vc4_hdmi.c | |
| parent | 082c6a2d06c0831d236760a29953355845eee988 (diff) | |
| parent | f99d4fccd2185176baf4ecac9a49d280fc62b953 (diff) | |
| download | linux-ca5ad734d30f30a577f705926d6e16a87513a2a7.tar.xz | |
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into sunxi/dt-for-6.17
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index a29a6ef266f9..163d092bd973 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -560,12 +560,6 @@ static int vc4_hdmi_connector_init(struct drm_device *dev, if (ret) return ret; - ret = drm_connector_hdmi_audio_init(connector, dev->dev, - &vc4_hdmi_audio_funcs, - 8, false, -1); - if (ret) - return ret; - drm_connector_helper_add(connector, &vc4_hdmi_connector_helper_funcs); /* @@ -2291,6 +2285,12 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) return ret; } + ret = drm_connector_hdmi_audio_init(&vc4_hdmi->connector, dev, + &vc4_hdmi_audio_funcs, 8, false, + -1); + if (ret) + return ret; + dai_link->cpus = &vc4_hdmi->audio.cpu; dai_link->codecs = &vc4_hdmi->audio.codec; dai_link->platforms = &vc4_hdmi->audio.platform; |