mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
51db334005
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.54 Removed upstreamed: generic/backport-6.6/780-24-v6.12-r8169-disable-ALDPS-per-default-for-RTL8125.patch[1] generic/pending-6.6/360-selftests-bpf-portability-of-unprivileged-tests.patch[2] Manually rebased: bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch bmips/patches-6.6/200-mips-bmips-automatically-detect-CPU-frequency.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=50d062b6cc90c45a0de54e9bd9903c82777d66bf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=103c0431c7fb4790affea121126840dbfb146341 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16602 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 65ac92600898d2508375e3b68103aa3b056dfcdd Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 29 Mar 2023 15:26:52 +0100
|
|
Subject: [PATCH 0578/1085] drm/vc4: hdmi: Enable the audio clock
|
|
|
|
The audio clock is used by the HDMI controller driver and we were using
|
|
it to get its audio rate and compute the dividers needed to reach a
|
|
given audio sample rate.
|
|
|
|
However, we were never enabling it, which was resulting in lockups on
|
|
the BCM2712.
|
|
|
|
Fixes: 632ee3aa8786 ("drm/vc4: hdmi: Add audio-related callbacks")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -3595,6 +3595,7 @@ static int vc4_hdmi_runtime_suspend(stru
|
|
{
|
|
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
|
|
|
|
+ clk_disable_unprepare(vc4_hdmi->audio_clock);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
|
|
return 0;
|
|
@@ -3627,6 +3628,10 @@ static int vc4_hdmi_runtime_resume(struc
|
|
goto err_disable_clk;
|
|
}
|
|
|
|
+ ret = clk_prepare_enable(vc4_hdmi->audio_clock);
|
|
+ if (ret)
|
|
+ goto err_disable_clk;
|
|
+
|
|
if (vc4_hdmi->variant->reset)
|
|
vc4_hdmi->variant->reset(vc4_hdmi);
|
|
|