mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +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>
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From a9c640d91233d2e1b38e32644a5f53bc2de1fce0 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 29 Apr 2021 21:58:27 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Simplify the connector state retrieval
|
|
|
|
When we have the entire DRM state, retrieving the connector state only
|
|
requires the drm_connector pointer. Fortunately for us, we have
|
|
allocated it as a part of the vc4_hdmi structure, so we can retrieve get
|
|
a pointer by simply accessing our field in that structure.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 21 +++------------------
|
|
1 file changed, 3 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -852,31 +852,16 @@ static void vc4_hdmi_recenter_fifo(struc
|
|
"VC4_HDMI_FIFO_CTL_RECENTER_DONE");
|
|
}
|
|
|
|
-static struct drm_connector_state *
|
|
-vc4_hdmi_encoder_get_connector_state(struct drm_encoder *encoder,
|
|
- struct drm_atomic_state *state)
|
|
-{
|
|
- struct drm_connector_state *conn_state;
|
|
- struct drm_connector *connector;
|
|
- unsigned int i;
|
|
-
|
|
- for_each_new_connector_in_state(state, connector, conn_state, i) {
|
|
- if (conn_state->best_encoder == encoder)
|
|
- return conn_state;
|
|
- }
|
|
-
|
|
- return NULL;
|
|
-}
|
|
-
|
|
static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
|
|
struct drm_atomic_state *state)
|
|
{
|
|
+ struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
+ struct drm_connector *connector = &vc4_hdmi->connector;
|
|
struct drm_connector_state *conn_state =
|
|
- vc4_hdmi_encoder_get_connector_state(encoder, state);
|
|
+ drm_atomic_get_new_connector_state(state, connector);
|
|
struct vc4_hdmi_connector_state *vc4_conn_state =
|
|
conn_state_to_vc4_hdmi_conn_state(conn_state);
|
|
struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
|
|
- struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
unsigned long bvb_rate, pixel_rate, hsm_rate;
|
|
int ret;
|
|
|