[PATCH i-g-t v3 3/3] tests/kms_hdr: Move capability checks inside dynamic subtests

[Pranay Samala <pranay.samala@intel.com>]

Earlier, output capability checks were done outside the dynamic
subtest scope using continue/break. This caused a problem where
if an earlier output (e.g., eDP) passed but a later output
(e.g., DP) failed a check (such as reading bpc), the entire
subtest would be skipped, discarding the earlier valid result
and reporting a false skip/failure.

Fix this by moving all output capability checks inside dynamic
block. Each pipe-output-format combination is now an independent
dynamic subtest that passes or skips on its own merit, without
affecting other combinations.

v2:
- Consider other pipe if pipe combo fails (Karthik)
- Handle test_fini wherever required (Karthik)

v3:
- Update the commit message (Karthik)

v4:
- Rebase

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4879
Signed-off-by: Pranay Samala <pranay.samala@intel.com>
Reviewed-by: Karthik B S <karthik.b.s@intel.com>
---
 tests/kms_hdr.c | 168 +++++++++++++++++++++---------------------------
 1 file changed, 74 insertions(+), 94 deletions(-)

diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index ded375a23..d50f87787 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -255,17 +255,6 @@ static void test_bpc_switch(data_t *data, uint32_t flags)
 	for_each_connected_output(display, output) {
 		igt_crtc_t *crtc;
 
-		if (!has_max_bpc(output)) {
-			igt_info("%s: Doesn't support IGT_CONNECTOR_MAX_BPC.\n",
-				 igt_output_name(output));
-			continue;
-		}
-
-		if (igt_get_output_max_bpc(output) < 10) {
-			igt_info("%s: Doesn't support 10 bpc.\n", igt_output_name(output));
-			continue;
-		}
-
 		for_each_crtc(display, crtc) {
 			igt_output_set_crtc(output,
 					    crtc);
@@ -275,17 +264,7 @@ static void test_bpc_switch(data_t *data, uint32_t flags)
 			}
 
 			for (int i = 0; i < ARRAY_SIZE(hdr_test_formats); i++) {
-				prepare_test(data, output,
-					     crtc);
-
-				if (is_intel_device(data->fd) &&
-				    !igt_max_bpc_constraint(display, crtc, output, 10)) {
-					igt_info("%s: No suitable mode found to use 10 bpc.\n",
-						  igt_output_name(output));
-
-					test_fini(data);
-					break;
-				}
+				prepare_test(data, output, crtc);
 
 				data->mode = igt_output_get_mode(output);
 				data->w = data->mode->hdisplay;
@@ -293,10 +272,24 @@ static void test_bpc_switch(data_t *data, uint32_t flags)
 
 				igt_dynamic_f("pipe-%s-%s-%s",
 					      igt_crtc_name(crtc), output->name,
-					      igt_format_str(hdr_test_formats[i]))
-					      test_bpc_switch_on_output(data,
-								       crtc,
-								       output, hdr_test_formats[i], flags);
+					      igt_format_str(hdr_test_formats[i])) {
+					igt_require_f(has_max_bpc(output),
+						      "%s: Doesn't support IGT_CONNECTOR_MAX_BPC.\n",
+						      igt_output_name(output));
+
+					igt_require_f(igt_get_output_max_bpc(output) >= 10,
+						      "%s: Doesn't support 10 bpc.\n",
+						      igt_output_name(output));
+
+					igt_require_f(!is_intel_device(data->fd) ||
+						      igt_max_bpc_constraint(display, crtc, output, 10),
+						      "%s: No suitable mode found to use 10 bpc.\n",
+						      igt_output_name(output));
+
+					test_bpc_switch_on_output(data, crtc, output,
+								  hdr_test_formats[i], flags);
+				}
+
 				test_fini(data);
 			}
 
@@ -533,43 +526,8 @@ static void test_hdr(data_t *data, uint32_t flags)
 	for_each_connected_output(display, output) {
 		igt_crtc_t *crtc;
 
-		/* To test HDR, 10 bpc is required, so we need to
-		 * set MAX_BPC property to 10bpc prior to setting
-		 * HDR metadata property. Therefore, checking.
-		 */
-		if (!has_max_bpc(output) || !igt_output_supports_hdr(output)) {
-			igt_info("%s: Doesn't support IGT_CONNECTOR_MAX_BPC or IGT_CONNECTOR_HDR_OUTPUT_METADATA.\n",
-				 igt_output_name(output));
-			continue;
-		}
-
-		/* For negative test, panel should be non-hdr. */
-		if ((flags & TEST_INVALID_HDR) && igt_is_panel_hdr(data->fd, output)) {
-			igt_info("%s: Can't run negative test on HDR panel.\n",
-				 igt_output_name(output));
-			continue;
-		}
-
-		if ((flags & ~TEST_INVALID_HDR) && !igt_is_panel_hdr(data->fd, output)) {
-			igt_info("%s: Can't run HDR tests on non-HDR panel.\n",
-				 igt_output_name(output));
-			continue;
-		}
-
-		if (igt_get_output_max_bpc(output) < 10) {
-			igt_info("%s: Doesn't support 10 bpc.\n", igt_output_name(output));
-			continue;
-		}
-
-		if ((flags & TEST_BRIGHTNESS) && !output_is_internal_panel(output)) {
-			igt_info("%s: Can't run brightness test on non-internal panel.\n",
-				 igt_output_name(output));
-			continue;
-		}
-
 		for_each_crtc(display, crtc) {
-			igt_output_set_crtc(output,
-					    crtc);
+			igt_output_set_crtc(output, crtc);
 			if (!intel_pipe_output_combo_valid(display)) {
 				igt_output_set_crtc(output, NULL);
 				continue;
@@ -579,42 +537,64 @@ static void test_hdr(data_t *data, uint32_t flags)
 				prepare_test(data, output,
 					     crtc);
 
-				/* Signal HDR requirement via metadata */
-				igt_hdr_fill_st2084(&hdr);
-				igt_hdr_set_metadata(data->output, &hdr);
-				if (igt_display_try_commit2(display, display->is_atomic ?
-							    COMMIT_ATOMIC : COMMIT_LEGACY)) {
-					igt_info("%s: Couldn't set HDR metadata\n",
-						  igt_output_name(output));
-					test_fini(data);
-					break;
-				}
-
-				if (is_intel_device(data->fd) &&
-				    !igt_max_bpc_constraint(display, crtc, output, 10)) {
-					igt_info("%s: No suitable mode found to use 10 bpc.\n",
-						  igt_output_name(output));
-
-					test_fini(data);
-					break;
-				}
-
-				if (igt_is_dsc_enabled(data->fd, output->name))
-					flags |= TEST_NEEDS_DSC;
-				else
-					flags &= ~TEST_NEEDS_DSC;
-
-				igt_hdr_set_metadata(data->output, NULL);
-				igt_display_commit2(display, display->is_atomic ?
-						    COMMIT_ATOMIC : COMMIT_LEGACY);
-
 				data->mode = igt_output_get_mode(output);
 				data->w = data->mode->hdisplay;
 				data->h = data->mode->vdisplay;
 
-				igt_dynamic_f("pipe-%s-%s-%s",
-					       igt_crtc_name(crtc), output->name,
-					       igt_format_str(hdr_test_formats[i])) {
+				igt_dynamic_f("pipe-%s-%s-%s", igt_crtc_name(crtc), output->name,
+					      igt_format_str(hdr_test_formats[i])) {
+					igt_require_f(has_max_bpc(output) &&
+						      igt_output_supports_hdr(output),
+						      "%s: Doesn't support IGT_CONNECTOR_MAX_BPC "
+						      "or IGT_CONNECTOR_HDR_OUTPUT_METADATA.\n",
+						      igt_output_name(output));
+
+					if (flags & TEST_INVALID_HDR)
+						igt_require_f(!igt_is_panel_hdr(data->fd, output),
+							      "%s: Can't run negative test on "
+							      "HDR panel.\n",
+							      igt_output_name(output));
+
+					if (!(flags & TEST_INVALID_HDR))
+						igt_require_f(igt_is_panel_hdr(data->fd, output),
+							      "%s: Can't run HDR tests on "
+							      "non-HDR panel.\n",
+							      igt_output_name(output));
+
+					igt_require_f(igt_get_output_max_bpc(output) >= 10,
+						      "%s: Doesn't support 10 bpc.\n",
+						      igt_output_name(output));
+
+					if (flags & TEST_BRIGHTNESS)
+						igt_require_f(output_is_internal_panel(output),
+							      "%s: Can't run brightness test on "
+							      "non-internal panel.\n",
+							      igt_output_name(output));
+
+					/* Signal HDR requirement via metadata */
+					igt_hdr_fill_st2084(&hdr);
+					igt_hdr_set_metadata(data->output, &hdr);
+					igt_require_f(!igt_display_try_commit2(display,
+									       display->is_atomic ?
+									       COMMIT_ATOMIC :
+									       COMMIT_LEGACY),
+						      "%s: Couldn't set HDR metadata\n",
+						      igt_output_name(output));
+
+					igt_require_f(!is_intel_device(data->fd) ||
+						      igt_max_bpc_constraint(display, crtc, output, 10),
+						      "%s: No suitable mode found to use 10 bpc.\n",
+						      igt_output_name(output));
+
+					if (igt_is_dsc_enabled(data->fd, output->name))
+						flags |= TEST_NEEDS_DSC;
+					else
+						flags &= ~TEST_NEEDS_DSC;
+
+					igt_hdr_set_metadata(data->output, NULL);
+					igt_display_commit2(display, display->is_atomic ?
+							    COMMIT_ATOMIC : COMMIT_LEGACY);
+
 					if (flags & (TEST_NONE | TEST_DPMS | TEST_SUSPEND |
 						     TEST_INVALID_HDR | TEST_BRIGHTNESS))
 						test_static_toggle(data,
-- 
2.34.1