All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robert Foss <robert.foss@collabora.com>
To: intel-gfx@lists.freedesktop.org,
	Tomeu Vizoso <tomeu.vizoso@collabora.com>,
	Maarten Lankhorst <maarten.lankhorst@intel.com>,
	Gustavo Padovan <gustavo.padovan@collabora.com>,
	Daniel Stone <daniels@collabora.com>,
	Mika Kahola <mika.kahola@intel.com>
Subject: [PATCH i-g-t v1 19/32] tests/kms_plane: Add support for dynamic number of planes
Date: Fri, 20 Jan 2017 12:45:41 -0500	[thread overview]
Message-ID: <20170120174554.14195-20-robert.foss@collabora.com> (raw)
In-Reply-To: <20170120174554.14195-1-robert.foss@collabora.com>

Add changes reflecting the new support for dynamic number of planes per pipe.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/kms_plane.c | 94 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index e843a170..14c444fc 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -150,7 +150,7 @@ enum {
 static void
 test_plane_position_with_output(data_t *data,
 				enum pipe pipe,
-				enum igt_plane plane,
+				int plane,
 				igt_output_t *output,
 				unsigned int flags)
 {
@@ -170,7 +170,7 @@ test_plane_position_with_output(data_t *data,
 	igt_output_set_pipe(output, pipe);
 
 	mode = igt_output_get_mode(output);
-	primary = igt_output_get_plane(output, 0);
+	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	sprite = igt_output_get_plane(output, plane);
 
 	create_fb_for_mode__position(data, mode, 100, 100, 64, 64,
@@ -222,7 +222,7 @@ test_plane_position_with_output(data_t *data,
 }
 
 static void
-test_plane_position(data_t *data, enum pipe pipe, enum igt_plane plane,
+test_plane_position(data_t *data, enum pipe pipe, int plane,
 		    unsigned int flags)
 {
 	igt_output_t *output;
@@ -294,7 +294,7 @@ enum {
 static void
 test_plane_panning_with_output(data_t *data,
 			       enum pipe pipe,
-			       enum igt_plane plane,
+			       int plane,
 			       igt_output_t *output,
 			       unsigned int flags)
 {
@@ -348,7 +348,7 @@ test_plane_panning_with_output(data_t *data,
 }
 
 static void
-test_plane_panning(data_t *data, enum pipe pipe, enum igt_plane plane,
+test_plane_panning(data_t *data, enum pipe pipe, int plane,
             unsigned int flags)
 {
 	igt_output_t *output;
@@ -367,47 +367,57 @@ test_plane_panning(data_t *data, enum pipe pipe, enum igt_plane plane,
 }
 
 static void
-run_tests_for_pipe_plane(data_t *data, enum pipe pipe, enum igt_plane plane)
+run_tests_for_pipe_plane(data_t *data, enum pipe pipe)
 {
-	igt_subtest_f("plane-position-covered-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_position(data, pipe, plane,
-				    TEST_POSITION_FULLY_COVERED);
-
-	igt_subtest_f("plane-position-hole-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_position(data, pipe, plane, 0);
-
-	igt_subtest_f("plane-position-hole-dpms-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_position(data, pipe, plane,
-				    TEST_DPMS);
-
-	igt_subtest_f("plane-panning-top-left-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_panning(data, pipe, plane, TEST_PANNING_TOP_LEFT);
-
-	igt_subtest_f("plane-panning-bottom-right-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_panning(data, pipe, plane,
-				   TEST_PANNING_BOTTOM_RIGHT);
-
-	igt_subtest_f("plane-panning-bottom-right-suspend-pipe-%s-plane-%d",
-		      kmstest_pipe_name(pipe), plane)
-		test_plane_panning(data, pipe, plane,
-				   TEST_PANNING_BOTTOM_RIGHT |
-				   TEST_SUSPEND_RESUME);
-}
+	igt_subtest_f("plane-position-covered-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_position(data, pipe, plane,
+					    TEST_POSITION_FULLY_COVERED);
+	}
 
-static void
-run_tests_for_pipe(data_t *data, enum pipe pipe)
-{
-	int plane;
+	igt_subtest_f("plane-position-hole-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_position(data, pipe, plane, 0);
+	}
+
+	igt_subtest_f("plane-position-hole-dpms-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_position(data, pipe, plane,
+					    TEST_DPMS);
+	}
+
+	igt_subtest_f("plane-panning-top-left-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_panning(data, pipe, plane, TEST_PANNING_TOP_LEFT);
+	}
 
-	for (plane = 1; plane < IGT_MAX_PLANES; plane++)
-		run_tests_for_pipe_plane(data, pipe, plane);
+	igt_subtest_f("plane-panning-bottom-right-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_panning(data, pipe, plane,
+					   TEST_PANNING_BOTTOM_RIGHT);
+	}
+
+	igt_subtest_f("plane-panning-bottom-right-suspend-pipe-%s-planes",
+		      kmstest_pipe_name(pipe)) {
+		int n_planes = data->display.pipes[pipe].n_planes;
+		for (int plane = 1; plane < n_planes; plane++)
+			test_plane_panning(data, pipe, plane,
+					   TEST_PANNING_BOTTOM_RIGHT |
+					   TEST_SUSPEND_RESUME);
+	}
 }
 
+
 static data_t data;
 
 igt_main
@@ -425,7 +435,7 @@ igt_main
 	}
 
 	for (int pipe = 0; pipe < I915_MAX_PIPES; pipe++)
-		run_tests_for_pipe(&data, pipe);
+		run_tests_for_pipe_plane(&data, pipe);
 
 	igt_fixture {
 		igt_display_fini(&data.display);
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-01-20 17:47 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-20 17:45 [PATCH i-g-t v1 00/32] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 01/32] lib/igt_kms: Add index property to kmstest_plane struct Robert Foss
2017-01-23 10:21   ` Mika Kahola
2017-01-20 17:45 ` [PATCH i-g-t v1 02/32] lib/igt_kms: Avoid depencency on static plane count Robert Foss
2017-01-23 10:31   ` Mika Kahola
2017-01-20 17:45 ` [PATCH i-g-t v1 03/32] lib/igt_kms: Rename kmstest properties nplanes and plane Robert Foss
2017-01-23 10:33   ` Mika Kahola
2017-01-20 17:45 ` [PATCH i-g-t v1 04/32] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-23 11:00   ` Mika Kahola
2017-01-23 15:47     ` Robert Foss
2017-01-24  9:03       ` Petri Latvala
2017-01-20 17:45 ` [PATCH i-g-t v1 05/32] tests/kms_atomic_transition: Add support for dynamic number of planes Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 06/32] tests/kms_busy: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 07/32] tests/kms_chv_cursor_fail: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 08/32] tests/kms_crtc_background_color: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 09/32] tests/kms_cursor_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 10/32] tests/kms_cursor_legacy: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 11/32] tests/kms_fbc_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 12/32] tests/kms_fence_pin_leak: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 13/32] tests/kms_flip_event_leak: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 14/32] tests/kms_legacy_colorkey: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 15/32] tests/kms_mmap_write_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 16/32] tests/kms_mmio_vs_cs_flip: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 17/32] tests/kms_panel_fitting: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 18/32] tests/kms_pipe_color: " Robert Foss
2017-01-20 17:45 ` Robert Foss [this message]
2017-01-20 17:45 ` [PATCH i-g-t v1 20/32] tests/kms_plane_multiple: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 21/32] tests/kms_plane_scaling: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 22/32] tests/kms_properties: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 23/32] tests/kms_psr_sink_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 24/32] tests/kms_pwrite_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 25/32] tests/kms_rmfb: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 26/32] tests/kms_rotation_crc: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 27/32] tests/kms_sink_crc_basic: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 28/32] tests/kms_universal_plane: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 29/32] tests/kms_vblank: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 30/32] tests/prime_mmap_kms: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 31/32] tests/kms_ccs: " Robert Foss
2017-01-20 17:45 ` [PATCH i-g-t v1 32/32] tests/kms_plane_lowres: " Robert Foss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170120174554.14195-20-robert.foss@collabora.com \
    --to=robert.foss@collabora.com \
    --cc=daniels@collabora.com \
    --cc=gustavo.padovan@collabora.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=maarten.lankhorst@intel.com \
    --cc=mika.kahola@intel.com \
    --cc=tomeu.vizoso@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.