diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-06-30 06:59:03 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-07-26 14:49:47 +0200 |
| commit | d23aa709f71f7788e36b4820ffc5533fbef0e342 (patch) | |
| tree | 96aef6046290abcdf59b0aae9961d20fbc00482b | |
| parent | 8b0dd38681d60522e47561d0bcbeb1827eb5688c (diff) | |
igt_kms: Remove kmstest_connector_config.crtc_idx
This is the same as using config.pipe because the order of crtcs will
never change.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
| -rw-r--r-- | lib/igt_kms.c | 4 | ||||
| -rw-r--r-- | lib/igt_kms.h | 1 | ||||
| -rw-r--r-- | tests/testdisplay.c | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 9b0b2f18..ad3c464a 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -854,9 +854,7 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id, config->connector = connector; config->encoder = found; config->crtc = drmModeGetCrtc(drm_fd, resources->crtcs[pipe]); - config->crtc_idx = pipe; - config->pipe = kmstest_get_pipe_from_crtc_id(drm_fd, - config->crtc->crtc_id); + config->pipe = pipe; drmModeFreeResources(resources); diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 829615d7..48820754 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -118,7 +118,6 @@ struct kmstest_connector_config { bool connector_dpms_changed; uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS]; uint32_t atomic_props_connector[IGT_NUM_CONNECTOR_PROPS]; - int crtc_idx; int pipe; unsigned valid_crtc_idx_mask; }; diff --git a/tests/testdisplay.c b/tests/testdisplay.c index 45280e4c..a974f42b 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -112,7 +112,6 @@ struct connector { drmModeEncoder *encoder; drmModeConnector *connector; int crtc; - int crtc_idx; int pipe; }; @@ -211,7 +210,6 @@ static void connector_find_preferred_mode(uint32_t connector_id, c->connector = config.connector; c->encoder = config.encoder; c->crtc = config.crtc->crtc_id; - c->crtc_idx = config.crtc_idx; c->pipe = config.pipe; if (mode_num != -1) { @@ -497,7 +495,7 @@ int update_display(bool probe) if (test_preferred_mode || force_mode || specified_mode_num != -1) - crtc_idx_mask &= ~(1 << connector->crtc_idx); + crtc_idx_mask &= ~(1 << connector->pipe); } } |