← Back to branch summary

~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/gbm/test_real_kms_output.cpp

Merge lp:~kdub/mir/connect-display-request

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/gbm/test_real_kms_output.cpp
71
71
 
72
72
        resources.add_crtc(crtc_ids[0], drmModeModeInfo());
73
73
        resources.add_encoder(encoder_ids[0], crtc_ids[0], possible_crtcs_mask);
74
 
        resources.add_connector(connector_ids[0], DRM_MODE_CONNECTED, encoder_ids[0],
 
74
        resources.add_connector(connector_ids[0], DRM_MODE_CONNECTOR_VGA,
 
75
                                DRM_MODE_CONNECTED, encoder_ids[0],
75
76
                                modes_empty, possible_encoder_ids1, geom::Size());
76
77
 
77
78
        resources.prepare();
89
90
        resources.add_crtc(crtc_ids[1], drmModeModeInfo());
90
91
        resources.add_encoder(encoder_ids[0], crtc_ids[0], possible_crtcs_mask1);
91
92
        resources.add_encoder(encoder_ids[1], invalid_id, possible_crtcs_mask_all);
92
 
        resources.add_connector(connector_ids[0], DRM_MODE_CONNECTED, invalid_id,
 
93
        resources.add_connector(connector_ids[0], DRM_MODE_CONNECTOR_Composite,
 
94
                                DRM_MODE_CONNECTED, invalid_id,
93
95
                                modes_empty, possible_encoder_ids2, geom::Size());
94
 
        resources.add_connector(connector_ids[1], DRM_MODE_CONNECTED, encoder_ids[0],
 
96
        resources.add_connector(connector_ids[1], DRM_MODE_CONNECTOR_DVIA,
 
97
                                DRM_MODE_CONNECTED, encoder_ids[0],
95
98
                                modes_empty, possible_encoder_ids2, geom::Size());
96
99
 
97
100
        resources.prepare();