← Back to branch summary

~vanvugt/mir/fix-1583532

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-05-26 02:12:27 UTC
  • mfrom: (3515.2.8 development-branch)
  • Revision ID: daniel.van.vugt@canonical.com-20160526021227-mimlsa3hpy4o7hiv
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp
672
672
    resources.reset();
673
673
    resources.add_crtc(crtc_ids[0], modes1[1]);
674
674
    resources.add_encoder(encoder_ids[0], crtc_ids[0], possible_crtcs_mask_empty);
 
675
    resources.add_encoder(encoder_ids[1], 0, possible_crtcs_mask_empty);
675
676
    resources.add_connector(connector_ids[0], DRM_MODE_CONNECTOR_Composite,
676
677
                            DRM_MODE_CONNECTED, encoder_ids[1],
677
678
                            modes1, possible_encoder_ids_empty,