diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-12 11:57:32 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-12 19:36:53 +0200 |
commit | 1cad834261e5792f19406faf111235737da15191 (patch) | |
tree | 5a4c4f84c0daa95d8e5a57f2e5530f172bf1b9ba /tests | |
parent | 81dfcaba88f2a6f04830b7da2fd7d79cf6120a40 (diff) |
lib/igt_kms: Simplify return value of kmstest_get_connector_config
A plain bool is enough.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_flip.c | 12 | ||||
-rw-r--r-- | tests/kms_psr_sink_crc.c | 11 | ||||
-rw-r--r-- | tests/kms_render.c | 6 | ||||
-rw-r--r-- | tests/kms_sink_crc_basic.c | 10 | ||||
-rw-r--r-- | tests/testdisplay.c | 4 |
5 files changed, 18 insertions, 25 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 45f1ba2f..5cd8c2f9 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -989,8 +989,8 @@ static void connector_find_preferred_mode(uint32_t connector_id, int crtc_idx, { struct kmstest_connector_config config; - if (kmstest_get_connector_config(drm_fd, connector_id, 1 << crtc_idx, - &config) < 0) { + if (!kmstest_get_connector_config(drm_fd, connector_id, 1 << crtc_idx, + &config)) { o->mode_valid = 0; return; } @@ -1032,12 +1032,12 @@ static void connector_find_compatible_mode(int crtc_idx0, int crtc_idx1, drmModeModeInfo *mode[2]; int n, m; - if (kmstest_get_connector_config(drm_fd, o->_connector[0], - 1 << crtc_idx0, &config[0]) < 0) + if (!kmstest_get_connector_config(drm_fd, o->_connector[0], + 1 << crtc_idx0, &config[0])) return; - if (kmstest_get_connector_config(drm_fd, o->_connector[1], - 1 << crtc_idx1, &config[1]) < 0) { + if (!kmstest_get_connector_config(drm_fd, o->_connector[1], + 1 << crtc_idx1, &config[1])) { kmstest_free_connector_config(&config[0]); return; } diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c index 324f9b40..8e8c9086 100644 --- a/tests/kms_psr_sink_crc.c +++ b/tests/kms_psr_sink_crc.c @@ -443,13 +443,10 @@ static void test_crc(data_t *data) static bool prepare_crtc(data_t *data, uint32_t connector_id) { - int ret; - - ret = kmstest_get_connector_config(data->drm_fd, - connector_id, - 1 << data->crtc_idx, - &data->config); - if (ret) + if (!kmstest_get_connector_config(data->drm_fd, + connector_id, + 1 << data->crtc_idx, + &data->config)) return false; data->fb_id[0] = create_fb(data, diff --git a/tests/kms_render.c b/tests/kms_render.c index d8d157c4..f4579298 100644 --- a/tests/kms_render.c +++ b/tests/kms_render.c @@ -198,11 +198,9 @@ static int run_test(const char *test_name, enum test_flags flags) connector_id = resources->connectors[i]; for (j = 0; j < resources->count_crtcs; j++) { struct kmstest_connector_config cconf; - int ret; - ret = kmstest_get_connector_config(drm_fd, connector_id, - 1 << j, &cconf); - if (ret < 0) + if (!kmstest_get_connector_config(drm_fd, connector_id, + 1 << j, &cconf)) continue; test_connector(test_name, &cconf, flags); diff --git a/tests/kms_sink_crc_basic.c b/tests/kms_sink_crc_basic.c index 079ec896..b977dec0 100644 --- a/tests/kms_sink_crc_basic.c +++ b/tests/kms_sink_crc_basic.c @@ -111,16 +111,14 @@ connector_set_mode(data_t *data, connector_t *connector, drmModeModeInfo *mode, static void basic_sink_crc_check(data_t *data, uint32_t connector_id) { connector_t connector; - int ret; char ref_crc_white[12]; char ref_crc_black[12]; char crc_check[12]; - ret = kmstest_get_connector_config(data->drm_fd, - connector_id, - 1 << 0, - &connector.config); - igt_require(ret == 0); + igt_require(kmstest_get_connector_config(data->drm_fd, + connector_id, + 1 << 0, + &connector.config)); /*Go White*/ connector_set_mode(data, &connector, &connector.config.default_mode, WHITE); diff --git a/tests/testdisplay.c b/tests/testdisplay.c index cfc629a1..89ee1109 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -191,8 +191,8 @@ static void connector_find_preferred_mode(uint32_t connector_id, { struct kmstest_connector_config config; - if (kmstest_get_connector_config(drm_fd, connector_id, crtc_idx_mask, - &config) < 0) { + if (!kmstest_get_connector_config(drm_fd, connector_id, crtc_idx_mask, + &config)) { c->mode_valid = 0; return; } |