public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH igt 5/8] tests/kms_fbc_crc: extract check_crc()
Date: Thu,  7 May 2015 15:56:33 -0300	[thread overview]
Message-ID: <1431024996-2267-6-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1431024996-2267-1-git-send-email-przanoni@gmail.com>

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

To remove some duplicated code. When we finally fix that FIXME, the
code will get a little bigger too.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 tests/kms_fbc_crc.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index 0f09a60..d36cf02 100644
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -207,11 +207,21 @@ static bool wait_for_fbc_enabled(data_t *data)
 	return igt_wait(fbc_enabled(data), 3000, 30);
 }
 
-static void test_crc(data_t *data, enum test_mode mode)
+static void check_crc(data_t *data, enum test_mode mode)
 {
-	uint32_t crtc_id = data->output->config.crtc->crtc_id;
 	igt_pipe_crc_t *pipe_crc = data->pipe_crc;
 	igt_crc_t crc;
+
+	igt_pipe_crc_collect_crc(pipe_crc, &crc);
+	if (mode == TEST_PAGE_FLIP)
+		igt_assert_crc_equal(&crc, &data->ref_crc[1]);
+	else
+		;/* FIXME: missing reference CRCs */
+}
+
+static void test_crc(data_t *data, enum test_mode mode)
+{
+	uint32_t crtc_id = data->output->config.crtc->crtc_id;
 	uint32_t handle = data->fb[0].gem_handle;
 
 	igt_assert(fbc_enabled(data));
@@ -266,11 +276,7 @@ static void test_crc(data_t *data, enum test_mode mode)
 	igt_wait_for_vblank(data->drm_fd, data->pipe);
 	igt_wait_for_vblank(data->drm_fd, data->pipe);
 
-	igt_pipe_crc_collect_crc(pipe_crc, &crc);
-	if (mode == TEST_PAGE_FLIP)
-		igt_assert_crc_equal(&crc, &data->ref_crc[1]);
-	else
-		;/* FIXME: missing reference CRCs */
+	check_crc(data, mode);
 
 	/*
 	 * Allow time for FBC to kick in again if it
@@ -278,11 +284,7 @@ static void test_crc(data_t *data, enum test_mode mode)
 	 */
 	igt_assert(wait_for_fbc_enabled(data));
 
-	igt_pipe_crc_collect_crc(pipe_crc, &crc);
-	if (mode == TEST_PAGE_FLIP)
-		igt_assert_crc_equal(&crc, &data->ref_crc[1]);
-	else
-		;/* FIXME: missing reference CRCs */
+	check_crc(data, mode);
 }
 
 static bool prepare_crtc(data_t *data)
-- 
2.1.4

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

  parent reply	other threads:[~2015-05-07 18:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-07 18:56 [PATCH igt 0/8] Make kms_fbc_crc useful again Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 1/8] tests/kms_fbc_crc: exec_nop() can also invalidate FBC Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 2/8] tests/kms_fbc_crc: increase the FBC wait timeout Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 3/8] tests/kms_fbc_crc: unify flip handling Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 4/8] tests/kms_fbc_crc: refactor context handling code Paulo Zanoni
2015-05-07 18:56 ` Paulo Zanoni [this message]
2015-05-07 18:56 ` [PATCH igt 6/8] tests/kms_fbc_crc: make the blt test draw the same pattern Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 7/8] tests/kms_fbc_crc: extract fill_mmap_{cpu, gtt}() Paulo Zanoni
2015-05-07 18:56 ` [PATCH igt 8/8] tests/kms_fb_crc: fix the reference CRC checking Paulo Zanoni

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=1431024996-2267-6-git-send-email-przanoni@gmail.com \
    --to=przanoni@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox