All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lyude <lyude@redhat.com>
To: igt-dev@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org, Ben Skeggs <bskeggs@redhat.com>
Subject: [Nouveau] [PATCH i-g-t 1/3] tests/kms_color: Don't opencode igt_check_crc_equal()
Date: Wed, 17 Mar 2021 18:42:20 -0400	[thread overview]
Message-ID: <20210317224222.447100-2-lyude@redhat.com> (raw)
In-Reply-To: <20210317224222.447100-1-lyude@redhat.com>

From: Lyude Paul <lyude@redhat.com>

Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Martin Peres <martin.peres@free.fr>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Jeremy Cline <jcline@redhat.com>
---
 tests/kms_color.c        | 2 +-
 tests/kms_color_helper.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/kms_color.c b/tests/kms_color.c
index f2686f57..705c9160 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -506,7 +506,7 @@ static bool test_pipe_ctm(data_t *data,
 		/* Verify that the CRC of the software computed output is
 		 * equal to the CRC of the CTM matrix transformation output.
 		 */
-		ret &= crc_equal(&crc_software, &crc_hardware);
+		ret &= !igt_skip_crc_compare || igt_check_crc_equal(&crc_software, &crc_hardware);
 
 		igt_plane_set_fb(primary, NULL);
 		igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index ac8e8454..5f223a88 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -245,12 +245,6 @@ get_blob(data_t *data, igt_pipe_t *pipe, enum igt_atomic_crtc_properties prop)
 	return drmModeGetPropertyBlob(data->drm_fd, prop_value);
 }
 
-bool crc_equal(igt_crc_t *a, igt_crc_t *b)
-{
-	return igt_skip_crc_compare ||
-		memcmp(a->crc, b->crc, sizeof(a->crc[0]) * a->n_words) == 0;
-}
-
 int
 pipe_set_property_blob_id(igt_pipe_t *pipe,
 			  enum igt_atomic_crtc_properties prop,
-- 
2.29.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

WARNING: multiple messages have this Message-ID (diff)
From: Lyude <lyude@redhat.com>
To: igt-dev@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org,
	Martin Peres <martin.peres@free.fr>,
	Ben Skeggs <bskeggs@redhat.com>
Subject: [igt-dev] [PATCH i-g-t 1/3] tests/kms_color: Don't opencode igt_check_crc_equal()
Date: Wed, 17 Mar 2021 18:42:20 -0400	[thread overview]
Message-ID: <20210317224222.447100-2-lyude@redhat.com> (raw)
In-Reply-To: <20210317224222.447100-1-lyude@redhat.com>

From: Lyude Paul <lyude@redhat.com>

Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Martin Peres <martin.peres@free.fr>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Jeremy Cline <jcline@redhat.com>
---
 tests/kms_color.c        | 2 +-
 tests/kms_color_helper.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/kms_color.c b/tests/kms_color.c
index f2686f57..705c9160 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -506,7 +506,7 @@ static bool test_pipe_ctm(data_t *data,
 		/* Verify that the CRC of the software computed output is
 		 * equal to the CRC of the CTM matrix transformation output.
 		 */
-		ret &= crc_equal(&crc_software, &crc_hardware);
+		ret &= !igt_skip_crc_compare || igt_check_crc_equal(&crc_software, &crc_hardware);
 
 		igt_plane_set_fb(primary, NULL);
 		igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index ac8e8454..5f223a88 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -245,12 +245,6 @@ get_blob(data_t *data, igt_pipe_t *pipe, enum igt_atomic_crtc_properties prop)
 	return drmModeGetPropertyBlob(data->drm_fd, prop_value);
 }
 
-bool crc_equal(igt_crc_t *a, igt_crc_t *b)
-{
-	return igt_skip_crc_compare ||
-		memcmp(a->crc, b->crc, sizeof(a->crc[0]) * a->n_words) == 0;
-}
-
 int
 pipe_set_property_blob_id(igt_pipe_t *pipe,
 			  enum igt_atomic_crtc_properties prop,
-- 
2.29.2

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

  reply	other threads:[~2021-03-17 22:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-17 22:42 [Nouveau] [PATCH i-g-t 0/3] tests/kms_color: Fixup for nouveau Lyude
2021-03-17 22:42 ` [igt-dev] " Lyude
2021-03-17 22:42 ` Lyude [this message]
2021-03-17 22:42   ` [igt-dev] [PATCH i-g-t 1/3] tests/kms_color: Don't opencode igt_check_crc_equal() Lyude
2021-03-17 22:42 ` [Nouveau] [PATCH i-g-t 2/3] tests/kms_color: Allow tests to run on any driver Lyude
2021-03-17 22:42   ` [igt-dev] " Lyude
2021-03-17 22:42 ` [Nouveau] [PATCH i-g-t 3/3] tests/kms_color: Stop leaking fbs Lyude
2021-03-17 22:42   ` [igt-dev] " Lyude
2021-03-18  0:14 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_color: Fixup for nouveau Patchwork
2021-03-18  2:50 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-03-18  6:42 ` [Nouveau] [igt-dev] [PATCH i-g-t 0/3] " Martin Peres
2021-03-18  6:42   ` Martin Peres
2021-03-18 16:13 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_color: Fixup for nouveau (rev2) Patchwork
2021-03-18 19:19 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2021-03-22 15:20 ` [Nouveau] [PATCH i-g-t 0/3] tests/kms_color: Fixup for nouveau Jeremy Cline
2021-03-22 15:20   ` [igt-dev] " Jeremy Cline

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=20210317224222.447100-2-lyude@redhat.com \
    --to=lyude@redhat.com \
    --cc=bskeggs@redhat.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=nouveau@lists.freedesktop.org \
    /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.