mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 9f7c0728efb0036f6f197126aa62da40cdf4713a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 28 Apr 2021 16:14:21 +0100
|
|
Subject: [PATCH] drm/vc4: Allow DBLCLK modes even if horz timing is
|
|
odd.
|
|
|
|
The 2711 pixel valve can't produce odd horizontal timings, and
|
|
checks were added to vc4_hdmi_encoder_atomic_check and
|
|
vc4_hdmi_encoder_mode_valid to filter out/block selection of
|
|
such modes.
|
|
|
|
Modes with DRM_MODE_FLAG_DBLCLK double all the horizontal timing
|
|
values before programming them into the PV. The PV values,
|
|
therefore, can not be odd, and so the modes can be supported.
|
|
|
|
Amend the filtering appropriately.
|
|
|
|
See https://github.com/raspberrypi/linux/issues/4307
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1067,6 +1067,7 @@ static int vc4_hdmi_encoder_atomic_check
|
|
unsigned long long tmds_rate;
|
|
|
|
if (vc4_hdmi->variant->unsupported_odd_h_timings &&
|
|
+ !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
|
|
((mode->hdisplay % 2) || (mode->hsync_start % 2) ||
|
|
(mode->hsync_end % 2) || (mode->htotal % 2)))
|
|
return -EINVAL;
|
|
@@ -1111,6 +1112,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e
|
|
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
|
|
if (vc4_hdmi->variant->unsupported_odd_h_timings &&
|
|
+ !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
|
|
((mode->hdisplay % 2) || (mode->hsync_start % 2) ||
|
|
(mode->hsync_end % 2) || (mode->htotal % 2)))
|
|
return MODE_H_ILLEGAL;
|