From: Greg Kroah-Hartman Date: Mon, 15 Aug 2022 15:47:29 +0000 (+0200) Subject: drop queue-5.10/drm-vc4-hdmi-create-a-custom-connector-state.patch X-Git-Tag: v5.15.61~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8929a589e6ad949416157ce9663a291ac9c7fd9;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/drm-vc4-hdmi-create-a-custom-connector-state.patch It added a build warning --- diff --git a/queue-5.10/drm-vc4-hdmi-correct-hdmi-timing-registers-for-inter.patch b/queue-5.10/drm-vc4-hdmi-correct-hdmi-timing-registers-for-inter.patch index 7cfad48f9a9..19577ededc2 100644 --- a/queue-5.10/drm-vc4-hdmi-correct-hdmi-timing-registers-for-inter.patch +++ b/queue-5.10/drm-vc4-hdmi-correct-hdmi-timing-registers-for-inter.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20220613144800.326124-33-maxime@cerno.tech Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- - drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++---- + drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index e3cd3432867a..3085eed2afe2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -592,13 +592,13 @@ static void vc5_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi, +@@ -565,13 +565,13 @@ static void vc5_hdmi_set_timings(struct VC4_SET_FIELD(mode->crtc_vsync_start - mode->crtc_vdisplay, VC5_HDMI_VERTA_VFP) | VC4_SET_FIELD(mode->crtc_vdisplay, VC5_HDMI_VERTA_VAL)); @@ -41,6 +39,3 @@ index e3cd3432867a..3085eed2afe2 100644 VC4_HDMI_VERTB_VBP)); HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021); --- -2.35.1 - diff --git a/queue-5.10/drm-vc4-hdmi-create-a-custom-connector-state.patch b/queue-5.10/drm-vc4-hdmi-create-a-custom-connector-state.patch deleted file mode 100644 index 0c40d1b0b07..00000000000 --- a/queue-5.10/drm-vc4-hdmi-create-a-custom-connector-state.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0570b898a56093a94f406728092be37c33bbee6e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Dec 2020 16:42:39 +0100 -Subject: drm/vc4: hdmi: Create a custom connector state - -From: Maxime Ripard - -[ Upstream commit fbe7271e47bebd7600fec171bce9d5bf066275f8 ] - -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 -Signed-off-by: Maxime Ripard -Reviewed-by: Dave Stevenson -Link: https://patchwork.freedesktop.org/patch/msgid/20201215154243.540115-6-maxime@cerno.tech -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 33 ++++++++++++++++++++++++++++++--- - drivers/gpu/drm/vc4/vc4_hdmi.h | 10 ++++++++++ - 2 files changed, 40 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 978afe706ee2..2d76f094c2d2 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -208,10 +208,37 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) - - 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 = { -@@ -219,7 +246,7 @@ static const struct drm_connector_funcs vc4_hdmi_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, - }; - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 0526a9cf608a..2cf5362052e2 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.h -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h -@@ -180,6 +180,16 @@ encoder_to_vc4_hdmi(struct drm_encoder *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); --- -2.35.1 - diff --git a/queue-5.10/drm-vc4-hdmi-fix-timings-for-interlaced-modes.patch b/queue-5.10/drm-vc4-hdmi-fix-timings-for-interlaced-modes.patch index 3b60d9b7dcd..8b1f616454f 100644 --- a/queue-5.10/drm-vc4-hdmi-fix-timings-for-interlaced-modes.patch +++ b/queue-5.10/drm-vc4-hdmi-fix-timings-for-interlaced-modes.patch @@ -21,15 +21,13 @@ Link: https://lore.kernel.org/r/20220613144800.326124-31-maxime@cerno.tech Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- - drivers/gpu/drm/vc4/vc4_crtc.c | 7 ++++--- - drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------ + drivers/gpu/drm/vc4/vc4_crtc.c | 7 ++++--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) -diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index f4e64db07d4e..79724fddfb4b 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c -@@ -346,7 +346,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) +@@ -346,7 +346,8 @@ static void vc4_crtc_config_pv(struct dr PV_HORZB_HACTIVE)); CRTC_WRITE(PV_VERTA, @@ -39,7 +37,7 @@ index f4e64db07d4e..79724fddfb4b 100644 PV_VERTA_VBP) | VC4_SET_FIELD(mode->crtc_vsync_end - mode->crtc_vsync_start, PV_VERTA_VSYNC)); -@@ -358,7 +359,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) +@@ -358,7 +359,7 @@ static void vc4_crtc_config_pv(struct dr if (interlace) { CRTC_WRITE(PV_VERTA_EVEN, VC4_SET_FIELD(mode->crtc_vtotal - @@ -48,7 +46,7 @@ index f4e64db07d4e..79724fddfb4b 100644 PV_VERTA_VBP) | VC4_SET_FIELD(mode->crtc_vsync_end - mode->crtc_vsync_start, -@@ -378,7 +379,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) +@@ -378,7 +379,7 @@ static void vc4_crtc_config_pv(struct dr PV_VCONTROL_CONTINUOUS | (is_dsi ? PV_VCONTROL_DSI : 0) | PV_VCONTROL_INTERLACE | @@ -57,11 +55,9 @@ index f4e64db07d4e..79724fddfb4b 100644 PV_VCONTROL_ODD_DELAY)); CRTC_WRITE(PV_VSYNCD_EVEN, 0); } else { -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 153bf0907bbd..e3cd3432867a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -549,12 +549,12 @@ static void vc4_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi, +@@ -522,12 +522,12 @@ static void vc4_hdmi_set_timings(struct VC4_HDMI_VERTA_VFP) | VC4_SET_FIELD(mode->crtc_vdisplay, VC4_HDMI_VERTA_VAL)); u32 vertb = (VC4_SET_FIELD(0, VC4_HDMI_VERTB_VSPO) | @@ -77,7 +73,7 @@ index 153bf0907bbd..e3cd3432867a 100644 VC4_HDMI_VERTB_VBP)); HDMI_WRITE(HDMI_HORZA, -@@ -593,12 +593,12 @@ static void vc5_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi, +@@ -566,12 +566,12 @@ static void vc5_hdmi_set_timings(struct VC5_HDMI_VERTA_VFP) | VC4_SET_FIELD(mode->crtc_vdisplay, VC5_HDMI_VERTA_VAL)); u32 vertb = (VC4_SET_FIELD(0, VC5_HDMI_VERTB_VSPO) | @@ -93,6 +89,3 @@ index 153bf0907bbd..e3cd3432867a 100644 VC4_HDMI_VERTB_VBP)); HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021); --- -2.35.1 - diff --git a/queue-5.10/drm-vc4-hdmi-limit-the-bcm2711-to-the-max-without-sc.patch b/queue-5.10/drm-vc4-hdmi-limit-the-bcm2711-to-the-max-without-sc.patch index 562a6edc3ee..2a9c039de43 100644 --- a/queue-5.10/drm-vc4-hdmi-limit-the-bcm2711-to-the-max-without-sc.patch +++ b/queue-5.10/drm-vc4-hdmi-limit-the-bcm2711-to-the-max-without-sc.patch @@ -16,11 +16,9 @@ Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20201215154243.540115-9-maxime@cerno.tech Signed-off-by: Sasha Levin --- - drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++-- + drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 2d76f094c2d2..153bf0907bbd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -83,6 +83,8 @@ @@ -32,7 +30,7 @@ index 2d76f094c2d2..153bf0907bbd 100644 static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) { struct drm_info_node *node = (struct drm_info_node *)m->private; -@@ -1966,7 +1968,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1939,7 +1941,7 @@ static const struct vc4_hdmi_variant bcm .encoder_type = VC4_ENCODER_TYPE_HDMI0, .debugfs_name = "hdmi0_regs", .card_name = "vc4-hdmi-0", @@ -41,7 +39,7 @@ index 2d76f094c2d2..153bf0907bbd 100644 .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), .phy_lane_mapping = { -@@ -1992,7 +1994,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1965,7 +1967,7 @@ static const struct vc4_hdmi_variant bcm .encoder_type = VC4_ENCODER_TYPE_HDMI1, .debugfs_name = "hdmi1_regs", .card_name = "vc4-hdmi-1", @@ -50,6 +48,3 @@ index 2d76f094c2d2..153bf0907bbd 100644 .registers = vc5_hdmi_hdmi1_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), .phy_lane_mapping = { --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 770b89a67d0..6225bed8410 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -203,7 +203,6 @@ drm-vc4-dsi-add-correct-stop-condition-to-vc4_dsi_en.patch drm-vc4-hdmi-remove-firmware-logic-for-mai-threshold.patch drm-vc4-hdmi-avoid-full-hdmi-audio-fifo-writes.patch drm-vc4-hdmi-don-t-access-the-connector-state-in-res.patch -drm-vc4-hdmi-create-a-custom-connector-state.patch drm-vc4-hdmi-limit-the-bcm2711-to-the-max-without-sc.patch drm-vc4-hdmi-fix-timings-for-interlaced-modes.patch drm-vc4-hdmi-correct-hdmi-timing-registers-for-inter.patch