diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-24 23:33:09 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-30 18:07:58 +0200 |
| commit | 29ee36f2597747c01d5c79c93ed31f5bcd06e219 (patch) | |
| tree | 0405a9d1331ddb83d9357fe97819ca964e494f5e /tests/testdisplay.c | |
| parent | 066ad35ee7b39ab51fb5b8e54c3abd72df016413 (diff) | |
lib: extract kmstest_set_connector_dpms
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/testdisplay.c')
| -rw-r--r-- | tests/testdisplay.c | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/tests/testdisplay.c b/tests/testdisplay.c index d807f905..9de7ca08 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -346,34 +346,6 @@ static void set_single(void) perror("Could not set signal handler"); } -static void set_connector_dpms(drmModeConnector *connector, int mode) -{ - int i, dpms = 0; - bool found_it = false; - - for (i = 0; i < connector->count_props; i++) { - struct drm_mode_get_property prop; - - prop.prop_id = connector->props[i]; - prop.count_values = 0; - prop.count_enum_blobs = 0; - if (drmIoctl(drm_fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) - continue; - - if (strcmp(prop.name, "DPMS")) - continue; - - dpms = prop.prop_id; - found_it = true; - break; - } - igt_assert_f(found_it, "DPMS property not found on %d\n", - connector->connector_id); - - igt_assert(drmModeConnectorSetProperty(drm_fd, connector->connector_id, - dpms, mode) == 0); -} - static void set_mode(struct connector *c) { @@ -430,9 +402,9 @@ set_mode(struct connector *c) sleep(sleep_between_modes); if (do_dpms) { - set_connector_dpms(c->connector, do_dpms); + kmstest_set_connector_dpms(drm_fd, c->connector, do_dpms); sleep(sleep_between_modes); - set_connector_dpms(c->connector, DRM_MODE_DPMS_ON); + kmstest_set_connector_dpms(drm_fd, c->connector, DRM_MODE_DPMS_ON); } if (qr_code){ @@ -608,9 +580,9 @@ set_stereo_mode(struct connector *c) sleep(sleep_between_modes); if (do_dpms) { - set_connector_dpms(c->connector, DRM_MODE_DPMS_OFF); + kmstest_set_connector_dpms(drm_fd, c->connector, DRM_MODE_DPMS_OFF); sleep(sleep_between_modes); - set_connector_dpms(c->connector, DRM_MODE_DPMS_ON); + kmstest_set_connector_dpms(drm_fd, c->connector, DRM_MODE_DPMS_ON); } } |