| Message ID | s0P4QVy7rx7iX5jIPuPPPXwFdJrn1sMI1jgKUBLOsI@cp4-web-032.plabs.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/4] drm: rework description of primary and cursor planes | expand |
On Fri, 11 Dec 2020 13:06:14 +0000 Simon Ser <contact@emersion.fr> wrote: > If a primary or cursor plane is not compatible with a CRTC it's attached > to via the legacy primary/cursor field, things will be broken for legacy > user-space. > > Signed-off-by: Simon Ser <contact@emersion.fr> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Pekka Paalanen <ppaalanen@gmail.com> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> > --- > drivers/gpu/drm/drm_mode_config.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c > index f1affc1bb679..2c73a60e8765 100644 > --- a/drivers/gpu/drm/drm_mode_config.c > +++ b/drivers/gpu/drm/drm_mode_config.c > @@ -625,6 +625,7 @@ static void validate_encoder_possible_crtcs(struct drm_encoder *encoder) > void drm_mode_config_validate(struct drm_device *dev) > { > struct drm_encoder *encoder; > + struct drm_crtc *crtc; > > if (!drm_core_check_feature(dev, DRIVER_MODESET)) > return; > @@ -636,4 +637,19 @@ void drm_mode_config_validate(struct drm_device *dev) > validate_encoder_possible_clones(encoder); > validate_encoder_possible_crtcs(encoder); > } > + > + drm_for_each_crtc(crtc, dev) { > + if (crtc->primary) { > + WARN(!(crtc->primary->possible_crtcs & BIT(crtc->index)), > + "Bogus primary plane possible_crtcs: [PLANE:%d:%s] must be compatible with [CRTC:%d:%s]\n", > + crtc->primary->base.id, crtc->primary->name, > + crtc->base.id, crtc->name); > + } > + if (crtc->cursor) { > + WARN(!(crtc->cursor->possible_crtcs & BIT(crtc->index)), > + "Bogus cursor plane possible_crtcs: [PLANE:%d:%s] must be compatible with [CRTC:%d:%s]\n", > + crtc->cursor->base.id, crtc->cursor->name, > + crtc->base.id, crtc->name); > + } > + } > }
diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c index f1affc1bb679..2c73a60e8765 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -625,6 +625,7 @@ static void validate_encoder_possible_crtcs(struct drm_encoder *encoder) void drm_mode_config_validate(struct drm_device *dev) { struct drm_encoder *encoder; + struct drm_crtc *crtc; if (!drm_core_check_feature(dev, DRIVER_MODESET)) return; @@ -636,4 +637,19 @@ void drm_mode_config_validate(struct drm_device *dev) validate_encoder_possible_clones(encoder); validate_encoder_possible_crtcs(encoder); } + + drm_for_each_crtc(crtc, dev) { + if (crtc->primary) { + WARN(!(crtc->primary->possible_crtcs & BIT(crtc->index)), + "Bogus primary plane possible_crtcs: [PLANE:%d:%s] must be compatible with [CRTC:%d:%s]\n", + crtc->primary->base.id, crtc->primary->name, + crtc->base.id, crtc->name); + } + if (crtc->cursor) { + WARN(!(crtc->cursor->possible_crtcs & BIT(crtc->index)), + "Bogus cursor plane possible_crtcs: [PLANE:%d:%s] must be compatible with [CRTC:%d:%s]\n", + crtc->cursor->base.id, crtc->cursor->name, + crtc->base.id, crtc->name); + } + } }