All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v2] tests/kms_hdr: Fix failure to read output_bpc
@ 2021-10-08  8:59 Stylon Wang
  2021-10-08  9:15 ` Simon Ser
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Stylon Wang @ 2021-10-08  8:59 UTC (permalink / raw)
  To: igt-dev
  Cc: nicholas.choi, harry.wentland, nicholas.kazlauskas,
	rodrigo.siqueira, contact, Stylon Wang

The first commit with TEST_ONLY flag in bpc-switch subtests
could fail the test, because previous state can be with any bpc
or even wth no crtc assigned to the connector.

v2:
- Keep the test commit for its original purpose of checking
  if 512x512 plane size works for the hardware.
- Add new atomic commit so the setting of 8 bpc really takes effect.

Signed-off-by: Stylon Wang <stylon.wang@amd.com>
---
 tests/kms_hdr.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index 5b8529c8..273263db 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -213,16 +213,27 @@ static void test_bpc_switch_on_output(data_t *data, igt_output_t *output,
 
 		draw_hdr_pattern(&afb);
 
-		/* Start in 8bpc. */
+		/* Plane may be required to fit fullscreen. Check it here and allow
+		 * smaller plane size in following tests.
+		 */
 		igt_plane_set_fb(data->primary, &afb);
 		igt_plane_set_size(data->primary, data->w, data->h);
-		igt_output_set_prop_value(data->output, IGT_CONNECTOR_MAX_BPC, 8);
 		ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY, NULL);
 		if (!ret) {
 			data->w = afb.width;
 			data->h = afb.height;
 		}
 
+		/* Start in 8bpc. */
+		igt_output_set_prop_value(data->output, IGT_CONNECTOR_MAX_BPC, 8);
+		igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+		/*
+		 * i915 driver doesn't expose max bpc as debugfs entry,
+		 * so limiting assert only for amd driver.
+		 */
+		if (is_amdgpu_device(data->fd))
+			assert_output_bpc(data, 8);
+
 		/*
 		 * amdgpu requires a primary plane when the CRTC is enabled.
 		 * However, some older Intel hardware (hsw) have scaling
@@ -232,13 +243,6 @@ static void test_bpc_switch_on_output(data_t *data, igt_output_t *output,
 		if (!is_amdgpu_device(data->fd))
 			igt_plane_set_fb(data->primary, NULL);
 
-		/*
-		 * i915 driver doesn't expose max bpc as debugfs entry,
-		 * so limiting assert only for amd driver.
-		 */
-		if (is_amdgpu_device(data->fd))
-			assert_output_bpc(data, 8);
-
 		/* Switch to 10bpc. */
 		igt_output_set_prop_value(data->output, IGT_CONNECTOR_MAX_BPC, 10);
 		igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
-- 
2.33.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-10-13 17:56 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-08  8:59 [igt-dev] [PATCH i-g-t v2] tests/kms_hdr: Fix failure to read output_bpc Stylon Wang
2021-10-08  9:15 ` Simon Ser
2021-10-08 12:27 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2021-10-08 13:13 ` [igt-dev] [PATCH i-g-t v2] " Harry Wentland
2021-10-08 16:30 ` [igt-dev] ✗ Fi.CI.IGT: failure for " Patchwork
2021-10-08 19:32 ` [igt-dev] [PATCH i-g-t v2] " Rodrigo Siqueira Jordao
2021-10-08 21:04   ` Vudum, Lakshminarayana
2021-10-13  5:56     ` Wang, Chao-kai (Stylon)
2021-10-13 17:56       ` Vudum, Lakshminarayana
2021-10-13 15:19 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork

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.