[PATCH i-g-t v1 1/2] tests/kms_properties: Refresh connector when property fetch fails

[Sowmiya S <sowmiya.s@intel.com>]

drmModeObjectGetProperties() may fail for connectors
that have just changed state (e.g., hotplug, reprobing)
and whose connector ID is now stale. Add a connector
specific recovery path to test_properties

Signed-off-by: Sowmiya S <sowmiya.s@intel.com>
---
 tests/kms_properties.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 86d05c6d4..8ac122850 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -178,14 +178,26 @@ static bool has_additional_test_lookup(uint32_t obj_type, const char *name,
 
 	return false;
 }
-static void test_properties(int fd, uint32_t type, uint32_t id, bool atomic, bool has_color_pipeline)
+
+static void test_properties(int fd, uint32_t type, uint32_t id, bool atomic,
+			    bool has_color_pipeline, igt_output_t *output)
 {
 	drmModeObjectPropertiesPtr props =
 		drmModeObjectGetProperties(fd, id, type);
 	int i, j, ret;
 	drmModeAtomicReqPtr req = NULL;
 
-	igt_assert(props);
+	if (!props && type == DRM_MODE_OBJECT_CONNECTOR && output) {
+		igt_info("Connector properties query failed on id=%u, refreshing output and retrying\n",
+			 id);
+		igt_output_refresh(output);
+		id = output->id;
+		props = drmModeObjectGetProperties(fd, id, type);
+	}
+
+	igt_assert_f(props,
+		     "Failed to get properties for object id=%u type=%u after retry (output: %s)\n",
+		     id, type, output ? output->name : "N/A");
 
 	if (atomic)
 		req = drmModeAtomicAlloc();
@@ -261,7 +273,7 @@ static void run_colorop_property_tests(igt_display_t *display,
 					  colorop->id,
 					  kmstest_plane_type_name(plane->type), output->name);
 				test_properties(display->drm_fd, DRM_MODE_OBJECT_COLOROP, colorop->id,
-						atomic, display->has_plane_color_pipeline);
+						atomic, display->has_plane_color_pipeline, output);
 
 				colorop_id = igt_colorop_get_prop(display, colorop,
 								IGT_COLOROP_NEXT);
@@ -288,7 +300,8 @@ static void run_plane_property_tests(igt_display_t *display, igt_crtc_t *crtc,
 			 igt_crtc_name(crtc), plane->index,
 			 kmstest_plane_type_name(plane->type), output->name);
 
-		test_properties(display->drm_fd, DRM_MODE_OBJECT_PLANE, plane->drm_plane->plane_id, atomic, display->has_plane_color_pipeline);
+		test_properties(display->drm_fd, DRM_MODE_OBJECT_PLANE, plane->drm_plane->plane_id,
+				atomic, display->has_plane_color_pipeline, output);
 	}
 
 	cleanup_pipe(display, crtc, output,
@@ -309,7 +322,8 @@ static void run_crtc_property_tests(igt_display_t *display, igt_crtc_t *crtc,
 	test_properties(display->drm_fd, DRM_MODE_OBJECT_CRTC,
 			crtc->crtc_id,
 			atomic,
-			false);
+			false,
+			output);
 
 	cleanup_pipe(display, crtc, output,
 		     &fb);
@@ -328,7 +342,8 @@ static void run_connector_property_tests(igt_display_t *display,
 	igt_info("Testing connector properties on output %s (pipe: %s)\n", output->name,
 		 igt_crtc_name(crtc));
 
-	test_properties(display->drm_fd, DRM_MODE_OBJECT_CONNECTOR, output->id, atomic, false);
+	test_properties(display->drm_fd, DRM_MODE_OBJECT_CONNECTOR, output->id,
+			atomic, false, output);
 
 	if (crtc != NULL)
 		cleanup_pipe(display, crtc,
-- 
2.43.0