mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
ca5c695a45
Deleted following upstreamed patches: bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch Manually rebased following patches: bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
From 02631cb4e30d7bc46f2b30657a84ddeb65831798 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 19 Oct 2021 17:31:58 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Introduce an output_enabled flag
|
|
|
|
We currently poke at encoder->crtc in the ALSA code path to determine
|
|
whether the HDMI output is enabled or not, and thus whether we should
|
|
allow the audio output.
|
|
|
|
However, that pointer is deprecated and shouldn't really be used by
|
|
atomic drivers anymore. Since we have the infrastructure in place now,
|
|
let's just create a flag that we toggle to report whether the controller
|
|
is currently enabled and use that instead of encoder->crtc in ALSA.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 16 ++++++++++++----
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 6 ++++++
|
|
2 files changed, 18 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -729,6 +729,11 @@ static void vc4_hdmi_encoder_post_crtc_p
|
|
|
|
static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
|
|
{
|
|
+ struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
+
|
|
+ mutex_lock(&vc4_hdmi->mutex);
|
|
+ vc4_hdmi->output_enabled = false;
|
|
+ mutex_unlock(&vc4_hdmi->mutex);
|
|
}
|
|
|
|
static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
|
|
@@ -1227,6 +1232,11 @@ static void vc4_hdmi_encoder_post_crtc_e
|
|
|
|
static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
|
|
{
|
|
+ struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
+
|
|
+ mutex_lock(&vc4_hdmi->mutex);
|
|
+ vc4_hdmi->output_enabled = true;
|
|
+ mutex_unlock(&vc4_hdmi->mutex);
|
|
}
|
|
|
|
static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder,
|
|
@@ -1408,14 +1418,12 @@ static inline struct vc4_hdmi *dai_to_hd
|
|
|
|
static bool vc4_hdmi_audio_can_stream(struct vc4_hdmi *vc4_hdmi)
|
|
{
|
|
- struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
|
|
-
|
|
lockdep_assert_held(&vc4_hdmi->mutex);
|
|
|
|
/*
|
|
- * The encoder doesn't have a CRTC until the first modeset.
|
|
+ * If the controller is disabled, prevent any ALSA output.
|
|
*/
|
|
- if (!encoder->crtc)
|
|
+ if (!vc4_hdmi->output_enabled)
|
|
return false;
|
|
|
|
/*
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -204,6 +204,12 @@ struct vc4_hdmi {
|
|
* for use by ALSA hooks and interrupt handlers. Protected by @mutex.
|
|
*/
|
|
struct drm_display_mode saved_adjusted_mode;
|
|
+
|
|
+ /**
|
|
+ * @output_enabled: Is the HDMI controller currently active?
|
|
+ * Protected by @mutex.
|
|
+ */
|
|
+ bool output_enabled;
|
|
};
|
|
|
|
static inline struct vc4_hdmi *
|