kms_flip: cleanups

cover

 tests/kms_flip.c | 88 +++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 57 deletions(-)
2.21.0
---
 tests/kms_flip.c | 15 ---------------
 1 file changed, 15 deletions(-)
index 798fc4e8..f769d30e 100755
@@ -68,7 +68,6 @@
 #define TEST_ENOENT		(1 << 22)
 #define TEST_FENCE_STRESS	(1 << 23)
 #define TEST_VBLANK_RACE	(1 << 24)
-#define TEST_RPM		(1 << 25)
 #define TEST_SUSPEND		(1 << 26)
 #define TEST_TS_CONT		(1 << 27)
 #define TEST_BO_TOOBIG		(1 << 28)

@@ -809,9 +808,6 @@ static unsigned int run_test_step(struct test_output *o)
 			     "failed to disable output: %s\n",
 			     strerror(errno));
 
-	if (o->flags & TEST_RPM)
-		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
-
 	if (o->flags & TEST_SUSPEND)
 		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
 					      SUSPEND_TEST_NONE);

@@ -1321,9 +1317,6 @@ static int run_test(int duration, int flags)
 
 	igt_require((flags & TEST_HANG) == 0 || !is_wedged(drm_fd));
 
-	if (flags & TEST_RPM)
-		igt_require(igt_setup_runtime_pm());
-
 	resources = drmModeGetResources(drm_fd);
 	igt_require(resources);
 

@@ -1570,10 +1563,6 @@ int main(int argc, char **argv)
 		if (tests[i].flags & TEST_NO_2X_OUTPUT)
 			continue;
 
-		/* code doesn't disable all crtcs, so skip rpm tests */
-		if (tests[i].flags & TEST_RPM)
-			continue;
-
 		igt_subtest_f( "2x-%s", tests[i].name)
 			run_pair(tests[i].duration, tests[i].flags);
 	}

@@ -1592,10 +1581,6 @@ int main(int argc, char **argv)
 		if (tests[i].flags & TEST_NO_2X_OUTPUT)
 			continue;
 
-		/* code doesn't disable all crtcs, so skip rpm tests */
-		if (tests[i].flags & TEST_RPM)
-			continue;
-
 		igt_subtest_f( "2x-%s-interruptible", tests[i].name)
 			run_pair(tests[i].duration, tests[i].flags);
 	}

2.21.0


-- 
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
---
 tests/kms_flip.c | 16 ----------------
 1 file changed, 16 deletions(-)
index f769d30e..0d261b77 100755
@@ -69,7 +69,6 @@
 #define TEST_FENCE_STRESS	(1 << 23)
 #define TEST_VBLANK_RACE	(1 << 24)
 #define TEST_SUSPEND		(1 << 26)
-#define TEST_TS_CONT		(1 << 27)
 #define TEST_BO_TOOBIG		(1 << 28)
 
 #define TEST_BASIC		(1 << 30)

@@ -497,21 +496,6 @@ static void check_state(const struct test_output *o, const struct event_state *e
 			     "unexpected %s seq %u, should be >= %u\n",
 			     es->name, es->current_seq, es->last_seq + o->seq_step);
 
-	/* Check that the vblank frame didn't wrap unexpectedly. */
-	if (o->flags & TEST_TS_CONT) {
-		/* Ignore seq_step here since vblank waits time out immediately
-		 * when we kill the crtc. */
-		igt_assert_f(es->current_seq - es->last_seq >= 0,
-			     "unexpected %s seq %u, should be >= %u\n",
-			     es->name, es->current_seq, es->last_seq);
-		igt_assert_f(es->current_seq - es->last_seq <= 150,
-			     "unexpected %s seq %u, should be < %u\n",
-			     es->name, es->current_seq, es->last_seq + 150);
-
-		igt_debug("testing ts continuity: Current frame %u, old frame %u\n",
-			  es->current_seq, es->last_seq);
-	}
-
 	if (o->flags & TEST_CHECK_TS) {
 		double elapsed, expected;
 

2.21.0
---
 tests/kms_flip.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
index 0d261b77..57138ec1 100755
@@ -1528,10 +1528,12 @@ int main(int argc, char **argv)
 		igt_install_exit_handler(kms_flip_exit_handler);
 		get_timestamp_format();
 
-		bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
-		if (bufmgr) {
-			devid = intel_get_drm_devid(drm_fd);
-			batch = intel_batchbuffer_alloc(bufmgr, devid);
+		if (is_i915_device(drm_fd)) {
+			bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
+			if (bufmgr) {
+				devid = intel_get_drm_devid(drm_fd);
+				batch = intel_batchbuffer_alloc(bufmgr, devid);
+			}
 		}
 	}
 

2.21.0
        "select error (errno %i)\n", errno);
  igt_assert_f(ret > 0,
        "select timed out or error (ret %d)\n", ret);
---
 tests/kms_flip.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
index 57138ec1..9ef77de9 100755
@@ -1014,9 +1014,7 @@ static unsigned int wait_for_events(struct test_output *o)
 		} while (ret < 0 && errno == EINTR);
 
 		igt_assert_f(ret >= 0,
-			     "select error (errno %i)\n", errno);
-		igt_assert_f(ret > 0,
-			     "select timed out or error (ret %d)\n", ret);
+			     "select error: %s (%d))\n", strerror(errno), ret);
 		igt_assert_f(!FD_ISSET(0, &fds),
 			     "no fds active, breaking\n");
 

2.21.0
        "select error (errno %i)\n", errno);
  igt_assert_f(ret > 0,
        "select timed out or error (ret %d)\n", ret);
Petri Latvala
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 tests/kms_flip.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
index 9ef77de9..42ae3ebc 100755
@@ -76,6 +76,9 @@
 #define EVENT_FLIP		(1 << 0)
 #define EVENT_VBLANK		(1 << 1)
 
+#define RUN_TEST		1
+#define RUN_PAIR		2
+
 #ifndef DRM_CAP_TIMESTAMP_MONOTONIC
 #define DRM_CAP_TIMESTAMP_MONOTONIC 6
 #endif

@@ -1164,7 +1167,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
 	int i;
 
 	switch (crtc_count) {
-	case 1:
+	case RUN_TEST:
 		connector_find_preferred_mode(o->_connector[0], crtc_idxs[0], o);
 		if (!o->mode_valid)
 			return;

@@ -1175,7 +1178,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
 			 kmstest_connector_type_str(o->kconnector[0]->connector_type),
 			 o->kconnector[0]->connector_type_id);
 		break;
-	case 2:
+	case RUN_PAIR:
 		connector_find_compatible_mode(crtc_idxs[0], crtc_idxs[1], o);
 		if (!o->mode_valid)
 			return;

@@ -1341,7 +1344,7 @@ static int run_test(int duration, int flags)
 			o.depth = 24;
 
 			crtc_idx = n;
-			run_test_on_crtc_set(&o, &crtc_idx, 1, duration);
+			run_test_on_crtc_set(&o, &crtc_idx, RUN_TEST, duration);
 		}
 	}
 

@@ -1410,7 +1413,8 @@ static int run_pair(int duration, int flags)
 					crtc_idxs[0] = n;
 					crtc_idxs[1] = m;
 
-					run_test_on_crtc_set(&o, crtc_idxs, 2,
+					run_test_on_crtc_set(&o, crtc_idxs,
+							     RUN_PAIR,
 							     duration);
 				}
 			}

2.21.0
---
 tests/kms_flip.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
index 42ae3ebc..de3ab600 100755
@@ -609,22 +609,24 @@ static bool is_wedged(int fd)
 
 static int set_mode(struct test_output *o, uint32_t fb, int x, int y)
 {
-	int n;
+	int n, ret;
 
 	for (n = o->count - 1; n >= 0; n--) {
+		uint32_t buffer_id = fb, x_crtc = x, y_crtc = y;
+		uint32_t *conn = &o->_connector[n];
+		int count = 1;
+		drmModeModeInfoPtr mode = &o->kmode[n];
+
 		if (fb == 0) {
-			int ret = drmModeSetCrtc(drm_fd, o->_crtc[n],
-						 0, 0, 0,
-						 0, 0, 0);
-			if (ret)
-				return ret;
-		} else {
-			int ret = drmModeSetCrtc(drm_fd, o->_crtc[n],
-						 fb, x, y,
-						 &o->_connector[n], 1, &o->kmode[n]);
-			if (ret)
-				return ret;
+			buffer_id = x_crtc = y_crtc = count = 0;
+			conn = NULL; mode = NULL;
 		}
+
+		ret = drmModeSetCrtc(drm_fd, o->_crtc[n],
+				     buffer_id, x_crtc, y_crtc,
+				     conn, count, mode);
+		if (ret)
+			return ret;
 	}
 
 	return 0;

2.21.0
---
 tests/kms_flip.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
index de3ab600..abfdd363 100755
@@ -947,8 +947,7 @@ static void paint_flip_mode(struct igt_fb *fb, bool odd_frame)
 	igt_put_cairo_ctx(drm_fd, fb, cr);
 }
 
-static int
-fb_is_bound(struct test_output *o, int fb)
+static bool fb_is_bound(struct test_output *o, int fb)
 {
 	int n;
 

@@ -958,7 +957,7 @@ fb_is_bound(struct test_output *o, int fb)
 		};
 
 		if (drmIoctl(drm_fd, DRM_IOCTL_MODE_GETCRTC, &mode))
-			return 0;
+			return false;
 
 		if (!mode.mode_valid || mode.fb_id != fb)
 			return false;

2.21.0
---
 tests/kms_flip.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
index de3ab600..abfdd363 100755
@@ -947,8 +947,7 @@ static void paint_flip_mode(struct igt_fb *fb, bool odd_frame)
 	igt_put_cairo_ctx(drm_fd, fb, cr);
 }
 
-static int
-fb_is_bound(struct test_output *o, int fb)
+static bool fb_is_bound(struct test_output *o, int fb)
 {
 	int n;
 

@@ -958,7 +957,7 @@ fb_is_bound(struct test_output *o, int fb)
 		};
 
 		if (drmIoctl(drm_fd, DRM_IOCTL_MODE_GETCRTC, &mode))
-			return 0;
+			return false;
 
 		if (!mode.mode_valid || mode.fb_id != fb)
 			return false;

---
 tests/kms_flip.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
index de3ab600..abfdd363 100755
@@ -947,8 +947,7 @@ static void paint_flip_mode(struct igt_fb *fb, bool odd_frame)
 	igt_put_cairo_ctx(drm_fd, fb, cr);
 }
 
-static int
-fb_is_bound(struct test_output *o, int fb)
+static bool fb_is_bound(struct test_output *o, int fb)
 {
 	int n;
 

@@ -958,7 +957,7 @@ fb_is_bound(struct test_output *o, int fb)
 		};
 
 		if (drmIoctl(drm_fd, DRM_IOCTL_MODE_GETCRTC, &mode))
-			return 0;
+			return false;
 
 		if (!mode.mode_valid || mode.fb_id != fb)
 			return false;

Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
    - shard-glk:          FAIL [fdo#103167] / [fdo#105682] -> PASS
    - shard-kbl:          FAIL [fdo#103167] / [fdo#105682] -> PASS
    - shard-apl:          FAIL [fdo#103167] / [fdo#105682] -> PASS

kms_flip: cleanups

Rodrigo Siqueira

Rodrigo Siqueira

Rodrigo Siqueira

Rodrigo Siqueira

Rodrigo Siqueira

Petri Latvala

Rodrigo Siqueira

Rodrigo Siqueira

Rodrigo Siqueira

Maarten Lankhorst

Rodrigo Siqueira

Patchwork

Patchwork