[PATCH v4 2/4] drm: validate possible_crtcs for primary and cursor planes

[Simon Ser]

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.

v4: use drm_crtc_mask instead of BIT (Ville)

Signed-off-by: Simon Ser <cont...@emersion.fr>
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Acked-by: Pekka Paalanen <pekka.paala...@collabora.com>
Cc: Ville Syrjala <ville.syrj...@linux.intel.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..1628c8b60d9a 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 & 
drm_crtc_mask(crtc)),
+                            "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 & 
drm_crtc_mask(crtc)),
+                            "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);
+               }
+       }
 }
-- 
2.29.2

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