From: Javier Martinez Canillas <javierm@redhat.com> To: Maxime Ripard <maxime@cerno.tech>, Maxime Ripard <mripard@kernel.org>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@gmail.com>, Thomas Zimmermann <tzimmermann@suse.de> Cc: "David Gow" <davidgow@google.com>, linaro-mm-sig@lists.linaro.org, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, linux-kselftest@vger.kernel.org, "Maíra Canal" <mairacanal@riseup.net>, linux-media@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, "Brendan Higgins" <brendan.higgins@linux.dev>, linux-kernel@vger.kernel.org, "Dave Stevenson" <dave.stevenson@raspberrypi.com> Subject: Re: [PATCH 10/24] drm/vc4: kms: Sort the CRTCs by output before assigning them Date: Fri, 25 Nov 2022 12:00:44 +0100 [thread overview] Message-ID: <2762e41f-0508-2e25-b787-7b68d5014a77@redhat.com> (raw) In-Reply-To: <20221123-rpi-kunit-tests-v1-10-051a0bb60a16@cerno.tech> On 11/23/22 16:25, Maxime Ripard wrote: > On the vc4 devices (and later), the blending is done by a single device > called the HVS. The HVS has three FIFO that can operate in parallel, and > route their output to 6 CRTCs and 7 encoders on the BCM2711. > > Each of these CRTCs and encoders have some contraints on which FIFO they constraints. > can feed from, so we need some code to take all those constraints into > account and assign FIFOs to CRTCs. > > The problem can be simplified by assigning those FIFOs to CRTCs by > ascending output index number. We had a comment mentioning it already, > but we were never actually enforcing it. > > It was working still in most situations because the probe order is > roughly equivalent, except for the (optional, and fairly rarely used on > the Pi4) VEC which was last in the probe order sequence, but one of the > earliest device to assign. > > This resulted in configurations that were rejected by our code but were > still valid with a different assignment. > > We can fix this by making sure we assign CRTCs to FIFOs by ordering > them by ascending HVS output index. > > Fixes: 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically") > Signed-off-by: Maxime Ripard <maxime@cerno.tech> > --- [...] > > - for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { > - struct vc4_crtc_state *old_vc4_crtc_state = > - to_vc4_crtc_state(old_crtc_state); > - struct vc4_crtc_state *new_vc4_crtc_state = > - to_vc4_crtc_state(new_crtc_state); > - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); > + /* > + * The problem we have to solve here is that we have up to 7 > + * encoders, connected to up to 6 CRTCs. > + * > + * Those CRTCs, depending on the instance, can be routed to 1, 2 > + * or 3 HVS FIFOs, and we need to set the change the muxing This sentence sounds a little bit off to me. Did you mean: "we need to set the muxing between" or "we need to change the muxing" ? I'm not familiar with VC4 but the patch seems to do what the commit message says, so the changes look good to me. Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> -- Best regards, Javier Martinez Canillas Core Platforms Red Hat
WARNING: multiple messages have this Message-ID (diff)
From: Javier Martinez Canillas <javierm@redhat.com> To: Maxime Ripard <maxime@cerno.tech>, Maxime Ripard <mripard@kernel.org>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@gmail.com>, Thomas Zimmermann <tzimmermann@suse.de> Cc: "David Gow" <davidgow@google.com>, "Brendan Higgins" <brendan.higgins@linux.dev>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Dave Stevenson" <dave.stevenson@raspberrypi.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, "Maíra Canal" <mairacanal@riseup.net>, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-media@vger.kernel.org Subject: Re: [PATCH 10/24] drm/vc4: kms: Sort the CRTCs by output before assigning them Date: Fri, 25 Nov 2022 12:00:44 +0100 [thread overview] Message-ID: <2762e41f-0508-2e25-b787-7b68d5014a77@redhat.com> (raw) In-Reply-To: <20221123-rpi-kunit-tests-v1-10-051a0bb60a16@cerno.tech> On 11/23/22 16:25, Maxime Ripard wrote: > On the vc4 devices (and later), the blending is done by a single device > called the HVS. The HVS has three FIFO that can operate in parallel, and > route their output to 6 CRTCs and 7 encoders on the BCM2711. > > Each of these CRTCs and encoders have some contraints on which FIFO they constraints. > can feed from, so we need some code to take all those constraints into > account and assign FIFOs to CRTCs. > > The problem can be simplified by assigning those FIFOs to CRTCs by > ascending output index number. We had a comment mentioning it already, > but we were never actually enforcing it. > > It was working still in most situations because the probe order is > roughly equivalent, except for the (optional, and fairly rarely used on > the Pi4) VEC which was last in the probe order sequence, but one of the > earliest device to assign. > > This resulted in configurations that were rejected by our code but were > still valid with a different assignment. > > We can fix this by making sure we assign CRTCs to FIFOs by ordering > them by ascending HVS output index. > > Fixes: 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically") > Signed-off-by: Maxime Ripard <maxime@cerno.tech> > --- [...] > > - for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { > - struct vc4_crtc_state *old_vc4_crtc_state = > - to_vc4_crtc_state(old_crtc_state); > - struct vc4_crtc_state *new_vc4_crtc_state = > - to_vc4_crtc_state(new_crtc_state); > - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); > + /* > + * The problem we have to solve here is that we have up to 7 > + * encoders, connected to up to 6 CRTCs. > + * > + * Those CRTCs, depending on the instance, can be routed to 1, 2 > + * or 3 HVS FIFOs, and we need to set the change the muxing This sentence sounds a little bit off to me. Did you mean: "we need to set the muxing between" or "we need to change the muxing" ? I'm not familiar with VC4 but the patch seems to do what the commit message says, so the changes look good to me. Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> -- Best regards, Javier Martinez Canillas Core Platforms Red Hat
next prev parent reply other threads:[~2022-11-25 11:01 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-23 15:25 [PATCH 00/24] drm: Introduce Kunit Tests to VC4 Maxime Ripard 2022-11-23 15:25 ` [PATCH 01/24] drm/tests: helpers: Rename the device init helper Maxime Ripard 2022-11-25 8:50 ` Javier Martinez Canillas 2022-11-25 8:50 ` Javier Martinez Canillas 2022-11-25 14:10 ` Maíra Canal 2022-11-25 14:10 ` Maíra Canal 2022-11-25 14:33 ` Maxime Ripard 2022-11-25 14:33 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 02/24] drm/tests: helpers: Remove the name parameter Maxime Ripard 2022-11-25 8:57 ` Javier Martinez Canillas 2022-11-25 8:57 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 03/24] drm/tests: helpers: Create the device in another function Maxime Ripard 2022-11-25 9:06 ` Javier Martinez Canillas 2022-11-25 9:06 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 04/24] drm/tests: helpers: Switch to a platform_device Maxime Ripard 2022-11-25 9:25 ` Javier Martinez Canillas 2022-11-25 9:25 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 05/24] drm/tests: helpers: Make sure the device is bound Maxime Ripard 2022-11-25 10:19 ` Javier Martinez Canillas 2022-11-25 10:19 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 06/24] drm/tests: kunit: Allow for a custom device struct to be allocated Maxime Ripard 2022-11-25 10:46 ` Javier Martinez Canillas 2022-11-25 10:46 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 07/24] drm/tests: helpers: Allow to pass a custom drm_driver Maxime Ripard 2022-11-25 10:48 ` Javier Martinez Canillas 2022-11-25 10:48 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 08/24] drm/tests: Add a test for DRM managed actions Maxime Ripard 2022-11-25 10:52 ` Javier Martinez Canillas 2022-11-25 10:52 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 09/24] drm/atomic: Constify the old/new state accessors Maxime Ripard 2022-11-25 10:54 ` Javier Martinez Canillas 2022-11-25 10:54 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 10/24] drm/vc4: kms: Sort the CRTCs by output before assigning them Maxime Ripard 2022-11-25 11:00 ` Javier Martinez Canillas [this message] 2022-11-25 11:00 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 11/24] drm/vc4: Constify container_of wrappers Maxime Ripard 2022-11-25 11:01 ` Javier Martinez Canillas 2022-11-25 11:01 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 12/24] drm/vc4: Move HVS state to main header Maxime Ripard 2022-11-25 11:04 ` Javier Martinez Canillas 2022-11-25 11:04 ` Javier Martinez Canillas 2022-11-23 15:25 ` [PATCH 13/24] drm/vc4: kms: Constify the HVS old/new state helpers Maxime Ripard 2022-11-25 11:05 ` Javier Martinez Canillas 2022-11-25 11:05 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 14/24] drm/vc4: txp: Reorder the variable assignments Maxime Ripard 2022-11-25 11:07 ` Javier Martinez Canillas 2022-11-25 11:07 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 15/24] drm/vc4: Add TXP encoder type Maxime Ripard 2022-11-25 11:11 ` Javier Martinez Canillas 2022-11-25 11:11 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 16/24] drm/vc4: txp: Initialise the CRTC before the encoder and connector Maxime Ripard 2022-11-25 11:12 ` Javier Martinez Canillas 2022-11-25 11:12 ` Javier Martinez Canillas 2022-11-28 11:04 ` (subset) " Maxime Ripard 2022-11-28 11:04 ` Maxime Ripard 2022-11-23 15:25 ` [PATCH 17/24] drm/vc4: crtc: Pass the device and data in vc4_crtc_init Maxime Ripard 2022-11-25 11:13 ` Javier Martinez Canillas 2022-11-25 11:13 ` Javier Martinez Canillas 2022-11-28 11:05 ` (subset) " Maxime Ripard 2022-11-28 11:05 ` Maxime Ripard 2022-11-23 15:26 ` [PATCH 18/24] drm/vc4: crtc: Introduce a lower-level crtc init helper Maxime Ripard 2022-11-25 11:29 ` Javier Martinez Canillas 2022-11-25 11:29 ` Javier Martinez Canillas 2022-11-23 15:26 ` [PATCH 19/24] drm/vc4: crtc: Make encoder lookup helper public Maxime Ripard 2022-11-25 11:30 ` Javier Martinez Canillas 2022-11-25 11:30 ` Javier Martinez Canillas 2022-11-23 15:26 ` [PATCH 20/24] drm/vc4: crtc: Provide a CRTC name Maxime Ripard 2022-11-25 11:32 ` Javier Martinez Canillas 2022-11-25 11:32 ` Javier Martinez Canillas 2022-11-28 11:05 ` (subset) " Maxime Ripard 2022-11-28 11:05 ` Maxime Ripard 2022-11-23 15:26 ` [PATCH 21/24] drm/vc4: hvs: Provide a function to initialize the HVS structure Maxime Ripard 2022-11-25 11:41 ` Javier Martinez Canillas 2022-11-25 11:41 ` Javier Martinez Canillas 2022-11-23 15:26 ` [PATCH 22/24] drm/vc4: tests: Introduce a mocking infrastructure Maxime Ripard 2022-11-25 12:53 ` kernel test robot 2022-11-25 12:53 ` kernel test robot 2022-11-23 15:26 ` [PATCH 23/24] drm/vc4: tests: Fail the current test if we access a register Maxime Ripard 2022-11-23 15:26 ` [PATCH 24/24] drm/vc4: tests: Add unit test suite for the PV muxing Maxime Ripard 2022-11-24 8:31 ` [PATCH 00/24] drm: Introduce Kunit Tests to VC4 David Gow 2022-11-24 8:31 ` David Gow 2022-11-24 14:01 ` Maxime Ripard 2022-11-24 14:01 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2762e41f-0508-2e25-b787-7b68d5014a77@redhat.com \ --to=javierm@redhat.com \ --cc=airlied@gmail.com \ --cc=brendan.higgins@linux.dev \ --cc=daniel@ffwll.ch \ --cc=dave.stevenson@raspberrypi.com \ --cc=davidgow@google.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=kunit-dev@googlegroups.com \ --cc=linaro-mm-sig@lists.linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mairacanal@riseup.net \ --cc=maxime@cerno.tech \ --cc=mripard@kernel.org \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.