mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
ed1536e0b6
Deleted (upstreamed): generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch [1] Other patches automatically rebased. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.41&id=99858114a3b2c8f5f8707d9bbd46c50f547c87c0 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From ca4627ecd3f93cd28ba3ae75af44e28224989b6a Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 2 Dec 2021 16:58:17 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Move clock validation to its own
|
|
function
|
|
|
|
Our code is doing the same clock rate validation in multiple instances.
|
|
Let's create a helper to share the rate validation.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 26 +++++++++++++++-----------
|
|
1 file changed, 15 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1251,6 +1251,19 @@ static void vc4_hdmi_encoder_atomic_mode
|
|
mutex_unlock(&vc4_hdmi->mutex);
|
|
}
|
|
|
|
+static enum drm_mode_status
|
|
+vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
|
|
+ unsigned long long clock)
|
|
+{
|
|
+ if (clock > vc4_hdmi->variant->max_pixel_clock)
|
|
+ return MODE_CLOCK_HIGH;
|
|
+
|
|
+ if (vc4_hdmi->disable_4kp60 && clock > HDMI_14_MAX_TMDS_CLK)
|
|
+ return MODE_CLOCK_HIGH;
|
|
+
|
|
+ return MODE_OK;
|
|
+}
|
|
+
|
|
#define WIFI_2_4GHz_CH1_MIN_FREQ 2400000000ULL
|
|
#define WIFI_2_4GHz_CH1_MAX_FREQ 2422000000ULL
|
|
|
|
@@ -1295,10 +1308,7 @@ static int vc4_hdmi_encoder_atomic_check
|
|
if (mode->flags & DRM_MODE_FLAG_DBLCLK)
|
|
pixel_rate = pixel_rate * 2;
|
|
|
|
- if (pixel_rate > vc4_hdmi->variant->max_pixel_clock)
|
|
- return -EINVAL;
|
|
-
|
|
- if (vc4_hdmi->disable_4kp60 && (pixel_rate > HDMI_14_MAX_TMDS_CLK))
|
|
+ if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, pixel_rate) != MODE_OK)
|
|
return -EINVAL;
|
|
|
|
vc4_state->pixel_rate = pixel_rate;
|
|
@@ -1318,13 +1328,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e
|
|
(mode->hsync_end % 2) || (mode->htotal % 2)))
|
|
return MODE_H_ILLEGAL;
|
|
|
|
- if ((mode->clock * 1000) > vc4_hdmi->variant->max_pixel_clock)
|
|
- return MODE_CLOCK_HIGH;
|
|
-
|
|
- if (vc4_hdmi->disable_4kp60 && vc4_hdmi_mode_needs_scrambling(mode))
|
|
- return MODE_CLOCK_HIGH;
|
|
-
|
|
- return MODE_OK;
|
|
+ return vc4_hdmi_encoder_clock_valid(vc4_hdmi, mode->clock * 1000);
|
|
}
|
|
|
|
static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
|