mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +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>
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
From e072b2d845ff91716d630f4d2a105bf63698cfe1 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 15 Dec 2020 16:42:39 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Create a custom connector state
|
|
|
|
When run with a higher bpc than 8, the clock of the HDMI controller needs
|
|
to be adjusted. Let's create a connector state that will be used at
|
|
atomic_check and atomic_enable to compute and store the clock rate
|
|
associated to the state.
|
|
|
|
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 33 ++++++++++++++++++++++++++++++---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 10 ++++++++++
|
|
2 files changed, 40 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -215,10 +215,37 @@ static int vc4_hdmi_connector_get_modes(
|
|
|
|
static void vc4_hdmi_connector_reset(struct drm_connector *connector)
|
|
{
|
|
- drm_atomic_helper_connector_reset(connector);
|
|
+ struct vc4_hdmi_connector_state *old_state =
|
|
+ conn_state_to_vc4_hdmi_conn_state(connector->state);
|
|
+ struct vc4_hdmi_connector_state *new_state =
|
|
+ kzalloc(sizeof(*new_state), GFP_KERNEL);
|
|
|
|
if (connector->state)
|
|
- drm_atomic_helper_connector_tv_reset(connector);
|
|
+ __drm_atomic_helper_connector_destroy_state(connector->state);
|
|
+
|
|
+ kfree(old_state);
|
|
+ __drm_atomic_helper_connector_reset(connector, &new_state->base);
|
|
+
|
|
+ if (!new_state)
|
|
+ return;
|
|
+
|
|
+ drm_atomic_helper_connector_tv_reset(connector);
|
|
+}
|
|
+
|
|
+static struct drm_connector_state *
|
|
+vc4_hdmi_connector_duplicate_state(struct drm_connector *connector)
|
|
+{
|
|
+ struct drm_connector_state *conn_state = connector->state;
|
|
+ struct vc4_hdmi_connector_state *vc4_state = conn_state_to_vc4_hdmi_conn_state(conn_state);
|
|
+ struct vc4_hdmi_connector_state *new_state;
|
|
+
|
|
+ new_state = kzalloc(sizeof(*new_state), GFP_KERNEL);
|
|
+ if (!new_state)
|
|
+ return NULL;
|
|
+
|
|
+ __drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
|
|
+
|
|
+ return &new_state->base;
|
|
}
|
|
|
|
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
|
|
@@ -226,7 +253,7 @@ static const struct drm_connector_funcs
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = vc4_hdmi_connector_destroy,
|
|
.reset = vc4_hdmi_connector_reset,
|
|
- .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
+ .atomic_duplicate_state = vc4_hdmi_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
};
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -187,6 +187,16 @@ encoder_to_vc4_hdmi(struct drm_encoder *
|
|
return container_of(_encoder, struct vc4_hdmi, encoder);
|
|
}
|
|
|
|
+struct vc4_hdmi_connector_state {
|
|
+ struct drm_connector_state base;
|
|
+};
|
|
+
|
|
+static inline struct vc4_hdmi_connector_state *
|
|
+conn_state_to_vc4_hdmi_conn_state(struct drm_connector_state *conn_state)
|
|
+{
|
|
+ return container_of(conn_state, struct vc4_hdmi_connector_state, base);
|
|
+}
|
|
+
|
|
void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
|
|
struct drm_display_mode *mode);
|
|
void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi);
|