[PATCH i-g-t 1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid

[PATCH i-g-t 1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid

[Pranay Samala]

This test iterates on all the available edids of HDMI.
Due to CI test timeut limitation, we are reducing the
number of edids to execute to avoid result as timeout.

Using extended flag to achieve this. The test will execute
only 25 edids when this flag is not used as CI doesnt uses
this flag.
In local execution to execute on all edids, we have to give
this flag at the runtime.

Signed-off-by: Pranay Samala <pranay.samala@intel.com>
---
 tests/chamelium/kms_chamelium_edid.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/chamelium/kms_chamelium_edid.c b/tests/chamelium/kms_chamelium_edid.c
index 8438f5f15..1bdde1768 100644
--- a/tests/chamelium/kms_chamelium_edid.c
+++ b/tests/chamelium/kms_chamelium_edid.c
@@ -122,6 +122,7 @@
  */
 
 #define MODE_CLOCK_ACCURACY 0.05 /* 5% */
+static bool extended;
 
 static void get_connectors_link_status_failed(chamelium_data_t *data,
 					      bool *link_status_failed)
@@ -273,6 +274,9 @@ static void edid_stress_resolution(chamelium_data_t *data,
 			      data->ports, data->port_count);
 
 
+	if (!extended)
+		edids_list_len = 25;
+
 	for (i = 0; i < edids_list_len; ++i) {
 		struct chamelium_edid *chamelium_edid;
 		drmModeModeInfo mode;
@@ -504,8 +508,22 @@ static void test_mode_timings(chamelium_data_t *data,
 	} while (++i < count_modes);
 }
 
+static int opt_handler(int opt, int opt_index, void *_data)
+{
+	switch (opt) {
+	case 'e':
+		extended = true;
+		break;
+	}
+
+	return IGT_OPT_HANDLER_SUCCESS;
+}
+
+const char *help_str =
+	"  -e \tExtended tests.\n";
+
 IGT_TEST_DESCRIPTION("Testing EDID with a Chamelium board");
-igt_main
+igt_main_args("e", NULL, help_str, opt_handler, NULL)
 {
 	chamelium_data_t data;
 	struct chamelium_port *port;
-- 
2.34.1

[PATCH i-g-t 2/2] HAX: Do not merge

[Pranay Samala]

Signed-off-by: Pranay Samala <pranay.samala@intel.com>
---
 tests/intel-ci/fast-feedback.testlist    | 2 ++
 tests/intel-ci/xe-fast-feedback.testlist | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index c9e478b75..341e38039 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -1,6 +1,8 @@
 # Try to load the driver if it's not available yet.
 igt@i915_module_load@load
 
+igt@kms_chamelium_edid@hdmi-edid-stress-resolution-non-4k
+
 igt@kms_flip@2x-wf_vblank-ts-check
 igt@kms_flip@2x-blocking-wf_vblank
 igt@kms_flip@2x-absolute-wf_vblank
diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist
index cfc7afdee..765d93bde 100644
--- a/tests/intel-ci/xe-fast-feedback.testlist
+++ b/tests/intel-ci/xe-fast-feedback.testlist
@@ -7,6 +7,8 @@ igt@fbdev@nullptr
 igt@fbdev@read
 igt@fbdev@write
 
+igt@kms_chamelium_edid@hdmi-edid-stress-resolution-non-4k
+
 igt@kms_flip@2x-wf_vblank-ts-check
 igt@kms_flip@2x-blocking-wf_vblank
 igt@kms_flip@2x-absolute-wf_vblank
-- 
2.34.1

✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid
URL   : https://patchwork.freedesktop.org/series/140134/
State : failure

== Summary ==

Applying: tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid
Applying: HAX: Do not merge
Using index info to reconstruct a base tree...
M	tests/intel-ci/fast-feedback.testlist
M	tests/intel-ci/xe-fast-feedback.testlist
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe-fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist
Auto-merging tests/intel-ci/fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/fast-feedback.testlist
Patch failed at 0002 HAX: Do not merge
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".