Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Validate encoder->possible_crtcs

WARN if the encoder possible_crtcs is effectively empty or contains
bits for non-existing crtcs.

v2: Move to drm_mode_config_validate() (Daniel)
Make the docs say we WARN when this is wrong (Daniel)
Extract full_crtc_mask()

Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200211162208.16224-7-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

+27 -2
+26 -1
drivers/gpu/drm/drm_mode_config.c
··· 581 581 encoder->possible_clones, encoder_mask); 582 582 } 583 583 584 + static u32 full_crtc_mask(struct drm_device *dev) 585 + { 586 + struct drm_crtc *crtc; 587 + u32 crtc_mask = 0; 588 + 589 + drm_for_each_crtc(crtc, dev) 590 + crtc_mask |= drm_crtc_mask(crtc); 591 + 592 + return crtc_mask; 593 + } 594 + 595 + static void validate_encoder_possible_crtcs(struct drm_encoder *encoder) 596 + { 597 + u32 crtc_mask = full_crtc_mask(encoder->dev); 598 + 599 + WARN((encoder->possible_crtcs & crtc_mask) == 0 || 600 + (encoder->possible_crtcs & ~crtc_mask) != 0, 601 + "Bogus possible_crtcs: " 602 + "[ENCODER:%d:%s] possible_crtcs=0x%x (full crtc mask=0x%x)\n", 603 + encoder->base.id, encoder->name, 604 + encoder->possible_crtcs, crtc_mask); 605 + } 606 + 584 607 void drm_mode_config_validate(struct drm_device *dev) 585 608 { 586 609 struct drm_encoder *encoder; ··· 611 588 drm_for_each_encoder(encoder, dev) 612 589 fixup_encoder_possible_clones(encoder); 613 590 614 - drm_for_each_encoder(encoder, dev) 591 + drm_for_each_encoder(encoder, dev) { 615 592 validate_encoder_possible_clones(encoder); 593 + validate_encoder_possible_crtcs(encoder); 594 + } 616 595 }
+1 -1
include/drm/drm_encoder.h
··· 142 142 * the bits for all &drm_crtc objects this encoder can be connected to 143 143 * before calling drm_dev_register(). 144 144 * 145 - * In reality almost every driver gets this wrong. 145 + * You will get a WARN if you get this wrong in the driver. 146 146 * 147 147 * Note that since CRTC objects can't be hotplugged the assigned indices 148 148 * are stable and hence known before registering all objects.