mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
d6d8851d12
Manually rebased: bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch bcm27xx/patches-5.15/950-0706-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch Removed upstreamed: bcm27xx/patches-5.15/950-0707-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch[1] bcm27xx/patches-5.15/950-0596-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch[2] ipq807x/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch [3] ipq807x/0034-v6.1-arm64-dts-qcom-ipq8074-fix-PCIe-PHY-serdes-size.patch [4] ipq807x/0103-arm64-dts-qcom-ipq8074-fix-Gen2-PCIe-QMP-PHY.patch [5] ipq807x/0104-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-QMP-PHY.patch [6] ipq807x/0105-arm64-dts-qcom-ipq8074-correct-Gen2-PCIe-ranges.patch [7] ipq807x/0108-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-node.patch [8] ipq807x/0109-arm64-dts-qcom-ipq8074-correct-PCIe-QMP-PHY-output-c.patch [9] ipq807x/0132-arm64-dts-qcom-ipq8074-correct-USB3-QMP-PHY-s-clock-.patch [10] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.99&id=d2991e6b30020e286f2dd9d3b4f43548c547caa6 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/vc4/vc4_dpi.c?h=v5.15.100&id=8e04aaffb6de5f1ae61de7b671c1531172ccf429 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=a55a645aa303a3f7ec37db69822d5420657626da 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=d9df682bcea57fa25f37bbf17eae56fa05662635 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=7e6eeb5fb3aa9e5feffdb6e137dcc06f5f6410e1 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=e88204931d9a60634cd50bbc679f045439c4b91d 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=1563af0f28afd3b6d64ac79a2aecced3969c90bf 8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=feb8c71f015d416f1afe90e1f62cf51e47376c67 9. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=69c7a270357a7d50ffd3471b14c60250041200e3 10. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=dd3d021ae5471d98adf81f1e897431c8657d0a18 Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3 Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Tested-by: Robert Marko <robimarko@gmail.com> #ipq807x/Dynalink WRX36 Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> #ipq807x/ax3600, x86_64/FW-7543B, ath79/tl-wdr3600, ipq806x/g10, ipq806x/nbg6817
61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
From b30b747d76946fb176bb4b044c830415d551b7bb Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 19 Aug 2021 13:50:12 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Actually check for the connector
|
|
status in hotplug
|
|
|
|
The drm_helper_hpd_irq_event() documentation states that this function
|
|
is "useful for drivers which can't or don't track hotplug interrupts for
|
|
each connector." and that "Drivers which support hotplug interrupts for
|
|
each connector individually and which have a more fine-grained detect
|
|
logic should bypass this code and directly call
|
|
drm_kms_helper_hotplug_event()". This is thus what we ended-up doing.
|
|
|
|
However, what this actually means, and is further explained in the
|
|
drm_kms_helper_hotplug_event() documentation, is that
|
|
drm_kms_helper_hotplug_event() should be called by drivers that can
|
|
track the connection status change, and if it has changed we should call
|
|
that function.
|
|
|
|
This underlying expectation we failed to provide is that the caller of
|
|
drm_kms_helper_hotplug_event() should call drm_helper_probe_detect() to
|
|
probe the new status of the connector.
|
|
|
|
Since we didn't do it, it meant that even though we were sending the
|
|
notification to user-space and the DRM clients that something changed we
|
|
never probed or updated our internal connector status ourselves.
|
|
|
|
This went mostly unnoticed since the detect callback usually doesn't
|
|
have any side-effect. Also, if we were using the DRM fbdev emulation
|
|
(which is a DRM client), or any user-space application that can deal
|
|
with hotplug events, chances are they would react to the hotplug event
|
|
by probing the connector status eventually.
|
|
|
|
However, now that we have to enable the scrambler in detect() if it was
|
|
enabled it has a side effect, and an application such as Kodi or
|
|
modetest doesn't deal with hotplug events. This resulted with a black
|
|
screen when Kodi or modetest was running when a screen was disconnected
|
|
and then reconnected, or switched off and on.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1802,10 +1802,11 @@ static void vc4_hdmi_audio_exit(struct v
|
|
static irqreturn_t vc4_hdmi_hpd_irq_thread(int irq, void *priv)
|
|
{
|
|
struct vc4_hdmi *vc4_hdmi = priv;
|
|
- struct drm_device *dev = vc4_hdmi->connector.dev;
|
|
+ struct drm_connector *connector = &vc4_hdmi->connector;
|
|
+ struct drm_device *dev = connector->dev;
|
|
|
|
if (dev && dev->registered)
|
|
- drm_kms_helper_hotplug_event(dev);
|
|
+ drm_connector_helper_hpd_irq_event(connector);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|