From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v3 5/7] drm: Validate encoder->possible_clones
Date: Tue, 11 Feb 2020 19:13:31 +0200 [thread overview]
Message-ID: <20200211171331.GY13686@intel.com> (raw)
In-Reply-To: <20200211170233.GL2363188@phenom.ffwll.local>
On Tue, Feb 11, 2020 at 06:02:33PM +0100, Daniel Vetter wrote:
> On Tue, Feb 11, 2020 at 06:22:06PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Many drivers are populating encoder->possible_clones wrong. Let's
> > persuade them to get it right by adding some loud WARNs.
> >
> > We'll cross check the bits between any two encoders. So either
> > both encoders can clone with the other, or neither can.
> >
> > We'll also complain about effectively empty possible_clones, and
> > possible_clones containing bits for encoders that don't exist.
> >
> > v2: encoder->possible_clones now includes the encoder itelf
> > v3: Move to drm_mode_config_validate() (Daniel)
> > Document that you get a WARN when this is wrong (Daniel)
> > Extract full_encoder_mask()
> >
> > Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> I wonder whether we should start to have some unit tests for stuff like
> this, like set up broken driver, make sure we have a WARN in dmesg. But
> ideally we'd do that with the mocking stuff Kunit hopefully has soon.
>
> </idle musings>
>
>
> > ---
> > drivers/gpu/drm/drm_mode_config.c | 40 +++++++++++++++++++++++++++++++
> > include/drm/drm_encoder.h | 2 ++
> > 2 files changed, 42 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
> > index 75e357c7e84d..afc91447293a 100644
> > --- a/drivers/gpu/drm/drm_mode_config.c
> > +++ b/drivers/gpu/drm/drm_mode_config.c
> > @@ -533,6 +533,17 @@ void drm_mode_config_cleanup(struct drm_device *dev)
> > }
> > EXPORT_SYMBOL(drm_mode_config_cleanup);
> >
> > +static u32 full_encoder_mask(struct drm_device *dev)
> > +{
> > + struct drm_encoder *encoder;
> > + u32 encoder_mask = 0;
> > +
> > + drm_for_each_encoder(encoder, dev)
> > + encoder_mask |= drm_encoder_mask(encoder);
> > +
> > + return encoder_mask;
> > +}
> > +
> > /*
> > * For some reason we want the encoder itself included in
> > * possible_clones. Make life easy for drivers by allowing them
> > @@ -544,10 +555,39 @@ static void fixup_encoder_possible_clones(struct drm_encoder *encoder)
> > encoder->possible_clones = drm_encoder_mask(encoder);
> > }
> >
> > +static void validate_encoder_possible_clones(struct drm_encoder *encoder)
> > +{
> > + struct drm_device *dev = encoder->dev;
> > + u32 encoder_mask = full_encoder_mask(dev);
> > + struct drm_encoder *other;
> > +
> > + drm_for_each_encoder(other, dev) {
> > + WARN(!(encoder->possible_clones & drm_encoder_mask(other)) !=
> > + !(other->possible_clones & drm_encoder_mask(encoder)),
>
> Bikeshed: !! as canonical "make this a bool value" might be slightly
> clearer, but whatever.
Can repaint.
>
> > + "possible_clones mismatch: "
> > + "[ENCODER:%d:%s] mask=0x%x possible_clones=0x%x vs. "
> > + "[ENCODER:%d:%s] mask=0x%x possible_clones=0x%x\n",
> > + encoder->base.id, encoder->name,
> > + drm_encoder_mask(encoder), encoder->possible_clones,
> > + other->base.id, other->name,
> > + drm_encoder_mask(other), other->possible_clones);
> > + }
> > +
> > + WARN((encoder->possible_clones & drm_encoder_mask(encoder)) == 0 ||
> > + (encoder->possible_clones & ~encoder_mask) != 0,
> > + "Bogus possible_clones: "
> > + "[ENCODER:%d:%s] possible_clones=0x%x (full encoder mask=0x%x)\n",
> > + encoder->base.id, encoder->name,
> > + encoder->possible_clones, encoder_mask);
> > +}
>
> Since it's next to each another double-checking that the fixup did add the
> self-clone is probably too much :-)
I changed the fixup to be just
if (possible_clones == 0)
possible_clones = drm_encoder_mask();
So if the driver tries to set it up but fails and forgets the
encoder itself this WARN will still trip.
>
> > +
> > void drm_mode_config_validate(struct drm_device *dev)
> > {
> > struct drm_encoder *encoder;
> >
> > drm_for_each_encoder(encoder, dev)
> > fixup_encoder_possible_clones(encoder);
> > +
> > + drm_for_each_encoder(encoder, dev)
> > + validate_encoder_possible_clones(encoder);
>
> > }
> > diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h
> > index 22d6cdf729f1..3741963b9587 100644
> > --- a/include/drm/drm_encoder.h
> > +++ b/include/drm/drm_encoder.h
> > @@ -163,6 +163,8 @@ struct drm_encoder {
> > * any cloning it can leave @possible_clones set to 0. The core will
> > * automagically fix this up by setting the bit for the encoder itself.
> > *
> > + * You will get a WARN if you get this wrong in the driver.
>
> Nice.
>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> > + *
> > * Note that since encoder objects can't be hotplugged the assigned indices
> > * are stable and hence known before registering all objects.
> > */
> > --
> > 2.24.1
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-02-11 17:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 16:22 [PATCH v3 0/7] drm: Try to fix encoder possible_clones/crtc Ville Syrjala
2020-02-11 16:22 ` [PATCH v3 1/7] drm: Include the encoder itself in possible_clones Ville Syrjala
2020-02-11 16:58 ` Daniel Vetter
2020-02-11 16:22 ` [PATCH v3 2/7] drm/gma500: Sanitize possible_clones Ville Syrjala
2020-02-11 16:22 ` [PATCH v3 3/7] drm/exynos: Use drm_encoder_mask() Ville Syrjala
2020-02-17 2:27 ` Inki Dae
2020-02-25 0:32 ` Inki Dae
2020-02-11 16:22 ` [PATCH v3 4/7] drm/imx: Remove the bogus possible_clones setup Ville Syrjala
2020-02-11 16:22 ` [PATCH v3 5/7] drm: Validate encoder->possible_clones Ville Syrjala
2020-02-11 17:02 ` Daniel Vetter
2020-02-11 17:13 ` Ville Syrjälä [this message]
2020-02-12 8:56 ` Daniel Vetter
2020-02-11 16:22 ` [PATCH v3 6/7] drm: Validate encoder->possible_crtcs Ville Syrjala
2020-02-11 17:04 ` Daniel Vetter
2020-09-06 11:19 ` Jan Kiszka
2020-09-07 7:14 ` Daniel Vetter
2020-09-10 18:18 ` Deucher, Alexander
2020-09-29 9:36 ` Jan Kiszka
2020-09-29 20:04 ` Alex Deucher
2020-12-03 21:30 ` Alex Deucher
2020-12-09 13:17 ` Daniel Vetter
2020-12-14 20:26 ` Jan Kiszka
2020-02-11 16:22 ` [PATCH v3 7/7] drm: Allow drivers to leave encoder->possible_crtcs==0 Ville Syrjala
2020-02-11 17:05 ` Daniel Vetter
2020-02-11 17:14 ` Ville Syrjälä
2020-02-12 9:07 ` Daniel Vetter
2020-02-12 9:08 ` Daniel Vetter
2020-03-18 16:44 ` Ville Syrjälä
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=20200211171331.GY13686@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).