This is a note to let you know that I've just added the patch titled
drm/vc4: txp: Properly set the possible_crtcs mask
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-txp-properly-set-the-possible_crtcs-mask.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 bf6de8e61509f3c957d7f75f017b18d40a18a950 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@xxxxxxxxxx>
Date: Fri, 7 May 2021 17:05:04 +0200
Subject: drm/vc4: txp: Properly set the possible_crtcs mask
From: Maxime Ripard <maxime@xxxxxxxxxx>
commit bf6de8e61509f3c957d7f75f017b18d40a18a950 upstream.
The current code does a binary OR on the possible_crtcs variable of the
TXP encoder, while we want to set it to that value instead.
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-2-maxime@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -503,7 +503,7 @@ static int vc4_txp_bind(struct device *d
return ret;
encoder = &txp->connector.encoder;
- encoder->possible_crtcs |= drm_crtc_mask(crtc);
+ encoder->possible_crtcs = drm_crtc_mask(crtc);
ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
dev_name(dev), txp);
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
