This is a note to let you know that I've just added the patch titled
drm/vc4: crtc: Skip the TXP
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-vc4-crtc-skip-the-txp.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 47a50743031ad4138050ae6d266ddd3dfe845ead Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@xxxxxxxxxx>
Date: Fri, 7 May 2021 17:05:05 +0200
Subject: drm/vc4: crtc: Skip the TXP
From: Maxime Ripard <maxime@xxxxxxxxxx>
commit 47a50743031ad4138050ae6d266ddd3dfe845ead upstream.
The vc4_set_crtc_possible_masks is meant to run over all the encoders
and then set their possible_crtcs mask to their associated pixelvalve.
However, since the commit 39fcb2808376 ("drm/vc4: txp: Turn the TXP into
a CRTC of its own"), the TXP has been turned to a CRTC and encoder of
its own, and while it does indeed register an encoder, it no longer has
an associated pixelvalve. The code will thus run over the TXP encoder
and set a bogus possible_crtcs mask, overriding the one set in the TXP
bind function.
In order to fix this, let's skip any virtual encoder.
Cc: <stable@xxxxxxxxxxxxxxx> # v5.9+
Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own")
Acked-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20210507150515.257424-3-maxime@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/vc4/vc4_crtc.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -1042,6 +1042,9 @@ static void vc4_set_crtc_possible_masks(
struct vc4_encoder *vc4_encoder;
int i;
+ if (encoder->encoder_type == DRM_MODE_ENCODER_VIRTUAL)
+ continue;
+
vc4_encoder = to_vc4_encoder(encoder);
for (i = 0; i < ARRAY_SIZE(pv_data->encoder_types); i++) {
if (vc4_encoder->type == encoder_types[i]) {
Patches currently in stable-queue which might be from maxime@xxxxxxxxxx are
queue-5.10/drm-vc4-fix-clock-source-for-vec-pixelvalve-on-bcm27.patch
queue-5.10/drm-vc4-fix-argument-ordering-in-vc4_crtc_get_margin.patch
queue-5.10/drm-vc4-crtc-skip-the-txp.patch
queue-5.10/drm-vc4-hdmi-prevent-clock-unbalance.patch
queue-5.10/drm-vc4-hdmi-fix-pm-reference-leak-in-vc4_hdmi_encod.patch
queue-5.10/drm-vc4-txp-properly-set-the-possible_crtcs-mask.patch
