Skip to content

Commit

Permalink
drm: Validate encoder->possible_crtcs
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Daniel Vetter <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Daniel Vetter <[email protected]>
  • Loading branch information
vsyrjala committed Mar 18, 2020
1 parent 74d2aac commit 0df1082
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
27 changes: 26 additions & 1 deletion drivers/gpu/drm/drm_mode_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,38 @@ static void validate_encoder_possible_clones(struct drm_encoder *encoder)
encoder->possible_clones, encoder_mask);
}

static u32 full_crtc_mask(struct drm_device *dev)
{
struct drm_crtc *crtc;
u32 crtc_mask = 0;

drm_for_each_crtc(crtc, dev)
crtc_mask |= drm_crtc_mask(crtc);

return crtc_mask;
}

static void validate_encoder_possible_crtcs(struct drm_encoder *encoder)
{
u32 crtc_mask = full_crtc_mask(encoder->dev);

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);
}

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)
drm_for_each_encoder(encoder, dev) {
validate_encoder_possible_clones(encoder);
validate_encoder_possible_crtcs(encoder);
}
}
2 changes: 1 addition & 1 deletion include/drm/drm_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct drm_encoder {
* the bits for all &drm_crtc objects this encoder can be connected to
* before calling drm_dev_register().
*
* In reality almost every driver gets this wrong.
* You will get a WARN if you get this wrong in the driver.
*
* Note that since CRTC objects can't be hotplugged the assigned indices
* are stable and hence known before registering all objects.
Expand Down

0 comments on commit 0df1082

Please sign in to comment.