[Intel-gfx] [PATCH 2/2] tests/debugfs_pipe_crc: set mode before creating CRC helper

[Daniel Vetter]

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 at intel.com>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 tests/debugfs_pipe_crc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/debugfs_pipe_crc.c b/tests/debugfs_pipe_crc.c
index 5ffa3c9..7f51724 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 */
-- 
1.8.4.rc3