lib/igt_kms: Remove output->valid again

This time add an explicit variable force_reprobe, which is set to true
on initial probe and might be set again (in a future patch) after a
hpd event.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

2 files changed, 13 insertions, 15 deletions

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 5312f8d8..eefe32f7 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1233,11 +1233,9 @@ static void igt_output_refresh(igt_output_t *output, bool final)
 
 	kmstest_free_connector_config(&output->config);
 
-	output->valid = _kmstest_connector_config(display->drm_fd,
-						  output->id,
-						  crtc_idx_mask,
-						  &output->config,
-						  output->valid < 0);
+	_kmstest_connector_config(display->drm_fd, output->id, crtc_idx_mask,
+				  &output->config, output->force_reprobe);
+	output->force_reprobe = false;
 
 	if (!output->name && output->config.connector) {
 		drmModeConnector *c = output->config.connector;
@@ -1250,16 +1248,17 @@ static void igt_output_refresh(igt_output_t *output, bool final)
 		igt_atomic_fill_connector_props(display, output,
 			IGT_NUM_CONNECTOR_PROPS, igt_connector_prop_names);
 
-	if (!output->valid)
-		return;
-
 	if (output->use_override_mode)
 		output->config.default_mode = output->override_mode;
 
+	if (output->config.pipe == PIPE_NONE)
+		return;
+
 	LOG(display, "%s: Selecting pipe %s\n", output->name,
 	    kmstest_pipe_name(output->config.pipe));
 
-	display->pipes_in_use |= 1 << output->config.pipe;
+	if (final)
+		display->pipes_in_use |= 1 << output->config.pipe;
 }
 
 static bool
@@ -1499,7 +1498,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
 		 * We don't assign each output a pipe unless
 		 * a pipe is set with igt_output_set_pipe().
 		 */
-		output->valid = -1;
+		output->force_reprobe = true;
 		output->pending_crtc_idx_mask = 0;
 		output->id = resources->connectors[i];
 		output->display = display;
@@ -1536,8 +1535,7 @@ static void igt_pipe_fini(igt_pipe_t *pipe)
 
 static void igt_output_fini(igt_output_t *output)
 {
-	if (output->valid > 0)
-		kmstest_free_connector_config(&output->config);
+	kmstest_free_connector_config(&output->config);
 	free(output->name);
 }
 
@@ -2242,7 +2240,7 @@ static int do_display_commit(igt_display_t *display,
 			igt_pipe_t *pipe_obj = &display->pipes[pipe];
 			igt_output_t *output = igt_pipe_get_output(pipe_obj);
 
-			if (output && output->valid > 0)
+			if (output)
 				valid_outs++;
 
 			ret = igt_pipe_commit(pipe_obj, s, fail_on_error);
@@ -2442,7 +2440,7 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe)
 	igt_display_t *display = output->display;
 	igt_pipe_t *old_pipe;
 
-	igt_assert(output->valid != -1);
+	igt_assert(output->name);
 
 	if (output->pending_crtc_idx_mask) {
 		old_pipe = igt_output_get_driving_pipe(output);
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 5234f6c1..b12c67fb 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -297,7 +297,7 @@ typedef struct {
 	uint32_t id;					/* KMS id */
 	struct kmstest_connector_config config;
 	char *name;
-	int valid; /* -1 == never probed */
+	bool force_reprobe;
 	unsigned long pending_crtc_idx_mask;
 	bool use_override_mode;
 	drmModeModeInfo override_mode;