Re: [PATCH 05/18] drm/vc4: crtc: Skip the TXP

From: Thomas Zimmermann <tzimmermann@suse.de>
To: Maxime Ripard <maxime@cerno.tech>,
	Andrzej Hajda <a.hajda@samsung.com>,
	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>,
	Jernej Skrabec <jernej.skrabec@siol.net>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Jonas Karlman <jonas@kwiboo.se>
Cc: Tim Gover <tim.gover@raspberrypi.com>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>,
	dri-devel@lists.freedesktop.org,
	bcm-kernel-feedback-list@broadcom.com,
	linux-rpi-kernel@lists.infradead.org,
	Phil Elwell <phil@raspberrypi.com>
Subject: Re: [PATCH 05/18] drm/vc4: crtc: Skip the TXP
Date: Fri, 9 Apr 2021 10:10:53 +0200	[thread overview]
Message-ID: <8398d74b-a97c-a14b-5d07-163a1a596eb4@suse.de> (raw)
In-Reply-To: <20210317154352.732095-6-maxime@cerno.tech>

[-- Attachment #1.1.1: Type: text/plain, Size: 2036 bytes --]

Am 17.03.21 um 16:43 schrieb Maxime Ripard:
> 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.
> 
> Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own")
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

dim fixes 39fcb2808376
Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own")
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Eric Anholt <eric@anholt.net>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: <stable@vger.kernel.org> # v5.9+

At least the CC: stable line should be there.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/vc4/vc4_crtc.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 269390bc586e..f1f2e8cbce79 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -1018,6 +1018,9 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm,
>   		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]) {
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel