[igt-dev] [i-g-t] tests/kms_rotation_crc: Remove hardcoding of platforms in igt_require()

[Srivatsa, Anusha]

>-----Original Message-----
>From: Srivatsa, Anusha
>Sent: Tuesday, February 13, 2018 5:09 PM
>To: igt-dev at lists.freedesktop.org
>Cc: Srivatsa, Anusha <anusha.srivatsa at intel.com>; Sripada, Radhakrishna
><radhakrishna.sripada at intel.com>; Vetter, Daniel <daniel.vetter at intel.com>;
>Vivi, Rodrigo <rodrigo.vivi at intel.com>; Maarten Lankhorst
><maarten.lankhorst at linux.intel.com>; Kahola, Mika <mika.kahola at intel.com>
>Subject: [i-g-t] tests/kms_rotation_crc: Remove hardcoding of platforms in
>igt_require()
>
>Rework the rotate and reflect subtests by checking the crtc supported properties
>against the ones that the test is testing. Remove the hardcoded platform names
>in
>igt_require()
>
>Cc: Radhakrishna Sripad <radhakrishna.sripada at intel.com>
>Cc: Daniel Vetter <daniel.vetter at intel.com>
>Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>Cc: Mika Kahola <mika.kahola at intel.com>
>Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
>---
> tests/kms_rotation_crc.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
>diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index
>0cd5c6e..49d57a2 100644
>--- a/tests/kms_rotation_crc.c
>+++ b/tests/kms_rotation_crc.c
>@@ -373,9 +373,6 @@ static void test_plane_rotation(data_t *data, int
>plane_type, bool test_bad_form
> 		igt_plane_t *plane;
> 		int i, j;
>
>-		if (IS_CHERRYVIEW(data->devid) && pipe != PIPE_B)
>-			continue;
>-
> 		igt_output_set_pipe(output, pipe);
>
> 		plane = igt_output_get_plane_type(output, plane_type); @@ -
>558,9 +555,7 @@ igt_main
> 		igt_subtest_f("%s-rotation-%s",
> 			      plane_test_str(subtest->plane),
> 			      rot_test_str(subtest->rot)) {
>-			igt_require(!(subtest->rot &
>-				    (IGT_ROTATION_90 | IGT_ROTATION_270)) ||
>-				    gen >= 9);
>+			igt_require(igt_plane_get_prop(data.display.pipes-
>>planes,
>+IGT_PLANE_ROTATION) & subtest->rot);

Mika, Maarten,
Any comments?

Anusha 
> 			data.rotation = subtest->rot;
> 			test_plane_rotation(&data, subtest->plane, false);
> 		}
>@@ -596,9 +591,8 @@ igt_main
> 		igt_subtest_f("primary-%s-reflect-x-%s",
> 			      tiling_test_str(reflect_x->tiling),
> 			      rot_test_str(reflect_x->rot)) {
>-			igt_require(gen >= 10 ||
>-				    (IS_CHERRYVIEW(data.devid) && reflect_x-
>>rot == IGT_ROTATION_0
>-				     && reflect_x->tiling ==
>LOCAL_I915_FORMAT_MOD_X_TILED));
>+			igt_require((igt_plane_get_prop(data.display.pipes-
>>planes, IGT_PLANE_ROTATION) & subtest->rot) &&
>+				    (reflect_x->rot == IGT_ROTATION_0 &&
>reflect_x->tiling ==
>+LOCAL_I915_FORMAT_MOD_X_TILED));
> 			data.rotation = (IGT_REFLECT_X | reflect_x->rot);
> 			data.override_tiling = reflect_x->tiling;
> 			test_plane_rotation(&data,
>DRM_PLANE_TYPE_PRIMARY, false);
>--
>2.7.4