summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-31 15:37:05 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-01 20:43:16 +0100
commit8bb5730d28122fe5c142815f1ad32c351bf36cfe (patch)
treeedcc2da07a9f1e0766aebdc6eece137b19445b1f
parent842007154da76dc2684077a4080c875bb3068f32 (diff)
tests/debugfs_pipe_crc: set mode before creating CRC helper
Otherwise the automagic skipping for DP ports on gmch platforms won't work. v2: We also need to just skip that connector, not the entire subtest. kms_cursor_crc still needs to be updated. Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/debugfs_pipe_crc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/debugfs_pipe_crc.c b/tests/debugfs_pipe_crc.c
index a242a5b3..770bbdb2 100644
--- a/tests/debugfs_pipe_crc.c
+++ b/tests/debugfs_pipe_crc.c
@@ -162,18 +162,20 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags)
if (!connector->valid)
continue;
- valid_connectors++;
fprintf(stdout, "%s: Testing connector %u\n",
igt_subtest_name(), connector->config.connector->connector_id);
+ connector_set_mode(data, connector, &connector->config.default_mode);
+
pipe_crc = igt_pipe_crc_new(&data->debugfs, data->drm_fd,
connector->config.pipe,
INTEL_PIPE_CRC_SOURCE_AUTO);
- connector_set_mode(data, connector, &connector->config.default_mode);
+ if (!pipe_crc)
+ continue;
+ valid_connectors++;
- igt_require(pipe_crc);
igt_assert(igt_pipe_crc_start(pipe_crc));
/* wait for 3 vblanks and the corresponding 3 CRCs */