mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +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>
86 lines
2.6 KiB
Diff
86 lines
2.6 KiB
Diff
From 3542a39c5655242ba89bb4f51e9237cbb7e8cf09 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 19 Nov 2021 16:16:40 +0000
|
|
Subject: [PATCH] drm/vc4: Ensure vc4_hdmi doesn't use 2711 HPD
|
|
registers on Pi0-3
|
|
|
|
The existing logic was flawed in that it could try reading the
|
|
2711 specific registers for HPD on a CM1/3 where the HPD GPIO
|
|
hadn't been defined in DT.
|
|
|
|
Ensure we don't do the 2711 register read on invalid hardware,
|
|
and then
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 24 ++++++++++++++++--------
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
|
|
2 files changed, 19 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -206,14 +206,8 @@ vc4_hdmi_connector_detect(struct drm_con
|
|
if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
|
|
connected = true;
|
|
} else {
|
|
- unsigned long flags;
|
|
- u32 hotplug;
|
|
-
|
|
- spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
|
|
- hotplug = HDMI_READ(HDMI_HOTPLUG);
|
|
- spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
|
|
-
|
|
- if (hotplug & VC4_HDMI_HOTPLUG_CONNECTED)
|
|
+ if (vc4_hdmi->variant->hp_detect &&
|
|
+ vc4_hdmi->variant->hp_detect(vc4_hdmi))
|
|
connected = true;
|
|
}
|
|
|
|
@@ -1355,6 +1349,18 @@ static u32 vc5_hdmi_channel_map(struct v
|
|
return channel_map;
|
|
}
|
|
|
|
+static bool vc5_hdmi_hp_detect(struct vc4_hdmi *vc4_hdmi)
|
|
+{
|
|
+ unsigned long flags;
|
|
+ u32 hotplug;
|
|
+
|
|
+ spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
|
|
+ hotplug = HDMI_READ(HDMI_HOTPLUG);
|
|
+ spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
|
|
+
|
|
+ return !!(hotplug & VC4_HDMI_HOTPLUG_CONNECTED);
|
|
+}
|
|
+
|
|
/* HDMI audio codec callbacks */
|
|
static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi,
|
|
unsigned int samplerate)
|
|
@@ -2777,6 +2783,7 @@ static const struct vc4_hdmi_variant bcm
|
|
.phy_rng_disable = vc5_hdmi_phy_rng_disable,
|
|
.channel_map = vc5_hdmi_channel_map,
|
|
.supports_hdr = true,
|
|
+ .hp_detect = vc5_hdmi_hp_detect,
|
|
};
|
|
|
|
static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
|
|
@@ -2805,6 +2812,7 @@ static const struct vc4_hdmi_variant bcm
|
|
.phy_rng_disable = vc5_hdmi_phy_rng_disable,
|
|
.channel_map = vc5_hdmi_channel_map,
|
|
.supports_hdr = true,
|
|
+ .hp_detect = vc5_hdmi_hp_detect,
|
|
};
|
|
|
|
static const struct of_device_id vc4_hdmi_dt_match[] = {
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -102,6 +102,9 @@ struct vc4_hdmi_variant {
|
|
|
|
/* Enables HDR metadata */
|
|
bool supports_hdr;
|
|
+
|
|
+ /* Callback for hardware specific hotplug detect */
|
|
+ bool (*hp_detect)(struct vc4_hdmi *vc4_hdmi);
|
|
};
|
|
|
|
/* HDMI audio information */
|