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 v2 6/6] drm: Validate encoder->possible_crtcs
Date: Fri, 7 Feb 2020 18:49:03 +0200 [thread overview]
Message-ID: <20200207164903.GO13686@intel.com> (raw)
In-Reply-To: <20200207163926.GN43062@phenom.ffwll.local>
On Fri, Feb 07, 2020 at 05:39:26PM +0100, Daniel Vetter wrote:
> On Fri, Feb 07, 2020 at 03:59:50PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > WARN if the encoder possible_crtcs is effectively empty or contains
> > bits for non-existing crtcs.
> >
> > TODO: Or should we perhapst just filter out any bit for a
> > non-exisiting crtc?
> >
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> >From a quick grep it looks like at least most drivers seem to get this
> right. Worth a shot to find the hold-outs.
>
> Two things:
> - Imo also best to move into the drm_mode_config_validate I suggested.
> - Please update the kerneldoc for drm_encoder.possible_crtcs to mention
> that this will WARN if you get it wrong (and maybe remove the line that
> most drivers screw this up).
ack
>
> Check itself lgtm.
> -Daniel
>
> > ---
> > drivers/gpu/drm/drm_encoder.c | 18 ++++++++++++++++++
> > 1 file changed, 18 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c
> > index bc2246f27e0d..f16b2a2518d7 100644
> > --- a/drivers/gpu/drm/drm_encoder.c
> > +++ b/drivers/gpu/drm/drm_encoder.c
> > @@ -107,6 +107,23 @@ static void validate_possible_clones(struct drm_encoder *encoder)
> > encoder->possible_clones, encoder_mask);
> > }
> >
> > +static void validate_possible_crtcs(struct drm_encoder *encoder)
> > +{
> > + struct drm_device *dev = encoder->dev;
> > + struct drm_crtc *crtc;
> > + u32 crtc_mask = 0;
> > +
> > + drm_for_each_crtc(crtc, dev)
> > + crtc_mask |= drm_crtc_mask(crtc);
> > +
> > + WARN((encoder->possible_crtcs & crtc_mask) == 0 ||
> > + (encoder->possible_crtcs & ~crtc_mask) != 0,
> > + "Bogus possible_crtcs: "
> > + "[ENCODER:%d:%s] possible_crtcs=0x%x (full crtc mask=0x%x)\n",
> > + encoder->base.id, encoder->name,
> > + encoder->possible_crtcs, crtc_mask);
> > +}
> > +
> > int drm_encoder_register_all(struct drm_device *dev)
> > {
> > struct drm_encoder *encoder;
> > @@ -115,6 +132,7 @@ int drm_encoder_register_all(struct drm_device *dev)
> > fixup_possible_clones(dev);
> >
> > drm_for_each_encoder(encoder, dev) {
> > + validate_possible_crtcs(encoder);
> > validate_possible_clones(encoder);
> >
> > if (encoder->funcs->late_register)
> > --
> > 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
WARNING: multiple messages have this Message-ID (diff)
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: [Intel-gfx] [PATCH v2 6/6] drm: Validate encoder->possible_crtcs
Date: Fri, 7 Feb 2020 18:49:03 +0200 [thread overview]
Message-ID: <20200207164903.GO13686@intel.com> (raw)
In-Reply-To: <20200207163926.GN43062@phenom.ffwll.local>
On Fri, Feb 07, 2020 at 05:39:26PM +0100, Daniel Vetter wrote:
> On Fri, Feb 07, 2020 at 03:59:50PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > WARN if the encoder possible_crtcs is effectively empty or contains
> > bits for non-existing crtcs.
> >
> > TODO: Or should we perhapst just filter out any bit for a
> > non-exisiting crtc?
> >
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> >From a quick grep it looks like at least most drivers seem to get this
> right. Worth a shot to find the hold-outs.
>
> Two things:
> - Imo also best to move into the drm_mode_config_validate I suggested.
> - Please update the kerneldoc for drm_encoder.possible_crtcs to mention
> that this will WARN if you get it wrong (and maybe remove the line that
> most drivers screw this up).
ack
>
> Check itself lgtm.
> -Daniel
>
> > ---
> > drivers/gpu/drm/drm_encoder.c | 18 ++++++++++++++++++
> > 1 file changed, 18 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c
> > index bc2246f27e0d..f16b2a2518d7 100644
> > --- a/drivers/gpu/drm/drm_encoder.c
> > +++ b/drivers/gpu/drm/drm_encoder.c
> > @@ -107,6 +107,23 @@ static void validate_possible_clones(struct drm_encoder *encoder)
> > encoder->possible_clones, encoder_mask);
> > }
> >
> > +static void validate_possible_crtcs(struct drm_encoder *encoder)
> > +{
> > + struct drm_device *dev = encoder->dev;
> > + struct drm_crtc *crtc;
> > + u32 crtc_mask = 0;
> > +
> > + drm_for_each_crtc(crtc, dev)
> > + crtc_mask |= drm_crtc_mask(crtc);
> > +
> > + WARN((encoder->possible_crtcs & crtc_mask) == 0 ||
> > + (encoder->possible_crtcs & ~crtc_mask) != 0,
> > + "Bogus possible_crtcs: "
> > + "[ENCODER:%d:%s] possible_crtcs=0x%x (full crtc mask=0x%x)\n",
> > + encoder->base.id, encoder->name,
> > + encoder->possible_crtcs, crtc_mask);
> > +}
> > +
> > int drm_encoder_register_all(struct drm_device *dev)
> > {
> > struct drm_encoder *encoder;
> > @@ -115,6 +132,7 @@ int drm_encoder_register_all(struct drm_device *dev)
> > fixup_possible_clones(dev);
> >
> > drm_for_each_encoder(encoder, dev) {
> > + validate_possible_crtcs(encoder);
> > validate_possible_clones(encoder);
> >
> > if (encoder->funcs->late_register)
> > --
> > 2.24.1
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-02-07 16:49 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 13:59 [PATCH v2 0/6] drm: Try to fix encoder possible_clones/crtc Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 13:59 ` [PATCH v2 1/6] drm: Include the encoder itself in possible_clones Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 14:28 ` Thomas Zimmermann
2020-02-07 14:28 ` [Intel-gfx] " Thomas Zimmermann
2020-02-07 14:50 ` Ville Syrjälä
2020-02-07 14:50 ` [Intel-gfx] " Ville Syrjälä
2020-02-07 16:27 ` Daniel Vetter
2020-02-07 16:27 ` Daniel Vetter
2020-02-07 16:34 ` Ville Syrjälä
2020-02-07 16:34 ` Ville Syrjälä
2020-02-07 16:40 ` Daniel Vetter
2020-02-07 16:40 ` Daniel Vetter
2020-02-10 8:16 ` Thomas Zimmermann
2020-02-10 8:16 ` Thomas Zimmermann
2020-02-07 16:36 ` Daniel Vetter
2020-02-07 16:36 ` [Intel-gfx] " Daniel Vetter
2020-02-07 13:59 ` [PATCH v2 2/6] drm/gma500: Sanitize possible_clones Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 16:30 ` Daniel Vetter
2020-02-07 16:30 ` [Intel-gfx] " Daniel Vetter
2020-02-07 13:59 ` [PATCH v2 3/6] drm/exynos: Use drm_encoder_mask() Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 14:19 ` Thomas Zimmermann
2020-02-07 14:19 ` [Intel-gfx] " Thomas Zimmermann
2020-02-07 13:59 ` [PATCH v2 4/6] drm/imx: Remove the bogus possible_clones setup Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 14:20 ` Thomas Zimmermann
2020-02-07 14:20 ` [Intel-gfx] " Thomas Zimmermann
2020-02-07 16:31 ` Daniel Vetter
2020-02-07 16:31 ` Daniel Vetter
2020-02-07 13:59 ` [PATCH v2 5/6] drm: Validate encoder->possible_clones Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 14:25 ` Thomas Zimmermann
2020-02-07 14:25 ` [Intel-gfx] " Thomas Zimmermann
2020-02-07 13:59 ` [PATCH v2 6/6] drm: Validate encoder->possible_crtcs Ville Syrjala
2020-02-07 13:59 ` [Intel-gfx] " Ville Syrjala
2020-02-07 16:39 ` Daniel Vetter
2020-02-07 16:39 ` [Intel-gfx] " Daniel Vetter
2020-02-07 16:49 ` Ville Syrjälä [this message]
2020-02-07 16:49 ` Ville Syrjälä
2020-02-07 17:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm: Try to fix encoder possible_clones/crtc (rev2) Patchwork
2020-02-10 16:36 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20200207164903.GO13686@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 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.