public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH v3 5/8] tests/kms_draw_crc: Fix generating reference CRCs on platforms w/o aperture
Date: Wed, 12 Feb 2020 23:50:34 +0200	[thread overview]
Message-ID: <20200212215036.27407-1-imre.deak@intel.com> (raw)
In-Reply-To: <20200211023108.25369-5-imre.deak@intel.com>

Generate reference CRCs by drawing through a WC mapping on platforms w/o
a GTT aperture.

v2:
- Fix code comment in draw_method_subtest(). (Matt)
v3:
- Use WC instead of CPU mapping. (Ashutosh)

Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com> (v2)
---
 tests/kms_draw_crc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/kms_draw_crc.c b/tests/kms_draw_crc.c
index 6de9feaeb..fa7433ab2 100644
--- a/tests/kms_draw_crc.c
+++ b/tests/kms_draw_crc.c
@@ -183,11 +183,13 @@ static void draw_method_subtest(enum igt_draw_method method,
 
 	igt_require(format_is_supported(formats[format_index], tiling));
 
-	/* Use IGT_DRAW_MMAP_GTT on an untiled buffer as the parameter for
+	/* Use IGT_DRAW_MMAP_GTT/WC on an untiled buffer as the parameter for
 	 * comparison. Cache the value so we don't recompute it for every single
 	 * subtest. */
 	if (!base_crcs[format_index].set) {
-		get_method_crc(IGT_DRAW_MMAP_GTT, formats[format_index],
+		get_method_crc(gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT :
+							       IGT_DRAW_MMAP_WC,
+			       formats[format_index],
 			       LOCAL_DRM_FORMAT_MOD_NONE,
 			       &base_crcs[format_index].crc);
 		base_crcs[format_index].set = true;
@@ -225,7 +227,9 @@ static void fill_fb_subtest(void)
 	igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay,
 		      DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb);
 
-	igt_draw_rect_fb(drm_fd, bufmgr, NULL, &fb, IGT_DRAW_MMAP_GTT,
+	igt_draw_rect_fb(drm_fd, bufmgr, NULL, &fb,
+			 gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT :
+							 IGT_DRAW_MMAP_WC,
 			 0, 0, fb.width, fb.height, 0xFF);
 
 	rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0,
-- 
2.23.1

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

  parent reply	other threads:[~2020-02-12 21:50 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-11  2:31 [igt-dev] [PATCH v2 1/8] lib/igt_draw: Refactor get_tiling calls Imre Deak
2020-02-11  2:31 ` [igt-dev] [PATCH v2 2/8] tests/kms_frontbuffer_tracking: Skip set tiling calls if not supported Imre Deak
2020-02-11  2:31 ` [igt-dev] [PATCH v2 3/8] tests/kms_available_modes_crc: Don't set tiling for framebuffer Imre Deak
2020-02-11 20:15   ` Dixit, Ashutosh
2020-02-11 20:42     ` Imre Deak
2020-02-11 22:35       ` Dixit, Ashutosh
2020-02-11  2:31 ` [igt-dev] [PATCH v2 4/8] tests/kms_draw_crc: Skip GTT subtests on platforms w/o aperture Imre Deak
2020-02-12  0:17   ` Dixit, Ashutosh
2020-02-12  2:41     ` Dixit, Ashutosh
2020-02-12  2:49       ` Dixit, Ashutosh
2020-02-11  2:31 ` [igt-dev] [PATCH v2 5/8] tests/kms_draw_crc: Fix generating reference CRCs " Imre Deak
2020-02-11 15:34   ` Matt Roper
2020-02-12  0:29   ` Dixit, Ashutosh
2020-02-12 10:23     ` Imre Deak
2020-02-12 16:57       ` Imre Deak
2020-02-12 21:50   ` Imre Deak [this message]
2020-02-13  4:20     ` [igt-dev] [PATCH v3 " Dixit, Ashutosh
2020-02-13  8:09       ` Imre Deak
2020-02-11  2:31 ` [igt-dev] [PATCH v2 6/8] tests/kms_frontbuffer_tracking: Skip GTT subtests " Imre Deak
2020-02-11 15:45   ` Matt Roper
2020-02-11 15:53     ` Imre Deak
2020-02-12  5:45   ` Dixit, Ashutosh
2020-02-12 17:01     ` Imre Deak
2020-02-12 21:50   ` [igt-dev] [PATCH v3 " Imre Deak
2020-02-13  4:34     ` Dixit, Ashutosh
2020-02-11  2:31 ` [igt-dev] [PATCH v2 7/8] lib/igt_draw: Fix igt_draw_fill_fb() " Imre Deak
2020-02-12  3:48   ` Dixit, Ashutosh
2020-02-12 21:50   ` [igt-dev] [PATCH v3 " Imre Deak
2020-02-13  4:22     ` Dixit, Ashutosh
2020-02-11  2:31 ` [igt-dev] [PATCH v2 8/8] lib/igt_fb: Make sure tiled YUV framebuffers are fully cleared Imre Deak
2020-02-11  3:21 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v2,1/8] lib/igt_draw: Refactor get_tiling calls Patchwork
2020-02-11 15:33 ` [igt-dev] [PATCH v2 1/8] " Matt Roper
2020-02-12 16:46 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [v2,1/8] " Patchwork
2020-02-13  8:26   ` Imre Deak
2020-02-12 22:36 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [v2,1/8] lib/igt_draw: Refactor get_tiling calls (rev4) Patchwork
2020-02-15 17:55 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

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=20200212215036.27407-1-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=igt-dev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox