diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 10:54:34 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 19:07:07 +0200 |
| commit | 8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch) | |
| tree | 1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch | |
| parent | 33b6885975ce376ff075362b7f0890326043111b (diff) | |
| download | upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2 upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip | |
bcm27xx: add kernel 5.10 support
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted
patches, wireless patches and defconfig patches.
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 4B v1.1 4G
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch b/target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch new file mode 100644 index 0000000000..46d373b22a --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0600-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch @@ -0,0 +1,52 @@ +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 +@@ -851,31 +851,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; + |