[PATCH i-g-t 1/2] tests/kms_content_protection: Group all force_hdcp14 tests together

[Suraj Kandpal <suraj.kandpal@intel.com>]

Change ordering of tests so that all force_hdcp14 test are run together,
that too after all the regular tests have been run.
Currently we are seeing these tests are putting MST DOCK in a bad state from
time to time where it can only report HDCP 1.4 after running these
tests.
The only exception here is the DPMS and suspend resume test which are
run last since the help MST DOCK to return back to good state.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 tests/kms_content_protection.c | 64 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index a42f699e9..3baf225cd 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -1025,42 +1025,17 @@ static const struct {
 	bool content_type;
 	bool is_force_hdcp14;
 } subtests[] = {
-	{ .desc = "Test content protection with atomic modesetting with HDCP1.4.",
-	  .name = "atomic-hdcp14",
-	  .cp_tests = 0,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
 	{ .desc = "Test content protection with atomic modesetting",
 	  .name = "atomic",
 	  .cp_tests = 0,
 	  .content_type = HDCP_CONTENT_TYPE_0,
 	  .is_force_hdcp14 = false,
 	},
-	{ .desc = "Test content protection with DPMS ON/OFF during "
-		  "atomic modesetting with HDCP1.4.",
-	  .name = "atomic-dpms-hdcp14",
-	  .cp_tests = CP_DPMS,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
-	{ .desc = "Test content protection with DPMS ON/OFF during atomic modesetting.",
-	  .name = "atomic-dpms",
-	  .cp_tests = CP_DPMS,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = false,
-	},
 	{ .desc = "Test for the integrity of link with type 0 content.",
 	  .name = "lic-type-0",
 	  .cp_tests = CP_LIC,
 	  .content_type = HDCP_CONTENT_TYPE_0,
 	},
-	{ .desc = "Test for the integrity of link with type 0 content.",
-	  .name = "lic-type-0-hdcp14",
-	  .cp_tests = CP_LIC,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
 	{ .desc = "Test for the integrity of link with type 1 content",
 	  .name = "lic-type-1",
 	  .cp_tests = CP_LIC,
@@ -1093,13 +1068,6 @@ static const struct {
 	  .content_type = HDCP_CONTENT_TYPE_0,
 	  .is_force_hdcp14 = false,
 	},
-	{ .desc = "Test to detect the HDCP status change when we are reading the uevent "
-		  "sent with the corresponding connector id and property id.",
-	  .name = "uevent-hdcp14",
-	  .cp_tests = CP_UEVENT,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
 	/*
 	 *  Testing the revocation check through SRM needs a HDCP sink with
 	 *  programmable Ksvs or we need a uAPI from kernel to read the
@@ -1115,6 +1083,38 @@ static const struct {
 	  .content_type = HDCP_CONTENT_TYPE_0,
 	  .is_force_hdcp14 = false,
 	},
+	{ .desc = "Test content protection with atomic modesetting with HDCP1.4.",
+	  .name = "atomic-hdcp14",
+	  .cp_tests = 0,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
+	{ .desc = "Test for the integrity of link with type 0 content.",
+	  .name = "lic-type-0-hdcp14",
+	  .cp_tests = CP_LIC,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
+	{ .desc = "Test to detect the HDCP status change when we are reading the uevent "
+		  "sent with the corresponding connector id and property id.",
+	  .name = "uevent-hdcp14",
+	  .cp_tests = CP_UEVENT,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
+	{ .desc = "Test content protection with DPMS ON/OFF during "
+		  "atomic modesetting with HDCP1.4.",
+	  .name = "atomic-dpms-hdcp14",
+	  .cp_tests = CP_DPMS,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
+	{ .desc = "Test content protection with DPMS ON/OFF during atomic modesetting.",
+	  .name = "atomic-dpms",
+	  .cp_tests = CP_DPMS,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = false,
+	},
 	{.desc = "Test to verify the behaviour of HDCP after suspend resume cycles.",
 	 .name = "suspend-resume",
 	 .cp_tests = SUSPEND_RESUME,
-- 
2.34.1