public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display.
@ 2018-10-03  9:13 Maarten Lankhorst
  2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2018-10-03  9:13 UTC (permalink / raw)
  To: igt-dev

This will fix the -EIO from trying to start CRC on a disabled pipe.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108147
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/kms_plane_alpha_blend.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
index 81c8cb916a63..3fab118ae0e1 100644
--- a/tests/kms_plane_alpha_blend.c
+++ b/tests/kms_plane_alpha_blend.c
@@ -266,8 +266,9 @@ static void basic_alpha(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
 	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
-	igt_pipe_crc_stop(data->pipe_crc);
 	igt_assert_crc_equal(&ref_crc, &crc);
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void argb_opaque(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -390,6 +391,7 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	if (plane->type != DRM_PLANE_TYPE_PRIMARY)
 		igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[pipe], DRM_PLANE_TYPE_PRIMARY), &data->gray_fb);
 
+	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_start(data->pipe_crc);
 
 	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
@@ -407,6 +409,8 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 		igt_assert_crc_equal(&ref_crc, &crc);
 	}
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -416,6 +420,7 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	int i;
 
 	igt_plane_set_prop_enum(plane, IGT_PLANE_PIXEL_BLEND_MODE, "Coverage");
+	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_start(data->pipe_crc);
 
 	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
@@ -433,6 +438,8 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 		igt_assert_crc_equal(&ref_crc, &crc);
 	}
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -462,6 +469,8 @@ static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t
 	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 	igt_assert_crc_equal(&ref_crc, &crc);
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, bool blend,
@@ -554,8 +563,6 @@ igt_main
 	enum pipe pipe;
 
 	igt_fixture {
-		igt_skip_on_simulation();
-
 		data.gfx_fd = drm_open_driver(DRIVER_ANY);
 		igt_require_pipe_crc(data.gfx_fd);
 		igt_display_init(&data.display, data.gfx_fd);
-- 
2.19.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-26 13:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-03  9:13 [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display Maarten Lankhorst
2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-10-03 14:20 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2018-10-19 14:31 ` [igt-dev] [PATCH i-g-t] " Imre Deak
2018-10-26 13:19   ` Maarten Lankhorst

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox