[PATCH i-g-t 2/2] tests/kms_content_protection: Group all MST 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 or not reporting any HDCP capability causing test skips.
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 | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 3baf225cd..c59441f11 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -1135,28 +1135,16 @@ static const struct {
 	  .content_type = HDCP_CONTENT_TYPE_0,
 	  .is_force_hdcp14 = false,
 	},
-	{ .desc = "Test Content protection(Type 0) over DP MST with HDCP1.4.",
-	  .name = "dp-mst-type-0-hdcp14",
+	{ .desc = "Test Content protection(Type 1) over DP MST.",
+	  .name = "dp-mst-type-1",
 	  .cp_tests = 0,
-	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
-	{ .desc = "Test Content protection(Type 0) over DP MST with LIC.",
-	  .name = "dp-mst-lic-type-0",
-	  .cp_tests = CP_LIC,
-	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .content_type = HDCP_CONTENT_TYPE_1,
 	  .is_force_hdcp14 = false,
 	},
 	{ .desc = "Test Content protection(Type 0) over DP MST with LIC.",
-	  .name = "dp-mst-lic-type-0-hdcp14",
+	  .name = "dp-mst-lic-type-0",
 	  .cp_tests = CP_LIC,
 	  .content_type = HDCP_CONTENT_TYPE_0,
-	  .is_force_hdcp14 = true,
-	},
-	{ .desc = "Test Content protection(Type 1) over DP MST.",
-	  .name = "dp-mst-type-1",
-	  .cp_tests = 0,
-	  .content_type = HDCP_CONTENT_TYPE_1,
 	  .is_force_hdcp14 = false,
 	},
 	{ .desc = "Test Content protection(Type 1) over DP MST with LIC.",
@@ -1165,6 +1153,18 @@ static const struct {
 	  .content_type = HDCP_CONTENT_TYPE_1,
 	  .is_force_hdcp14 = false,
 	},
+	{ .desc = "Test Content protection(Type 0) over DP MST with HDCP1.4.",
+	  .name = "dp-mst-type-0-hdcp14",
+	  .cp_tests = 0,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
+	{ .desc = "Test Content protection(Type 0) over DP MST with LIC.",
+	  .name = "dp-mst-lic-type-0-hdcp14",
+	  .cp_tests = CP_LIC,
+	  .content_type = HDCP_CONTENT_TYPE_0,
+	  .is_force_hdcp14 = true,
+	},
 	{ .desc = "Test Content protection(Type 0) over DP MST with suspend resume.",
 	  .name = "dp-mst-type-0-suspend-resume",
 	  .cp_tests = SUSPEND_RESUME,
-- 
2.34.1