From: Ramalingam C <ramalingam.c@intel.com>
To: igt-dev <igt-dev@lists.freedesktop.org>
Subject: [igt-dev] [PATCH i-g-t v2 2/2] tests/i915_pm_rpm: use device coherent mapping instead of mmap_gtt
Date: Fri, 7 Feb 2020 19:15:27 +0530 [thread overview]
Message-ID: <20200207134527.17205-2-ramalingam.c@intel.com> (raw)
In-Reply-To: <20200207134527.17205-1-ramalingam.c@intel.com>
Since on new discrete GPUs we dont have the mappable aperture, if that
is acceptable for the test purpose, we should use GEM_MMAP_OFFSET.
Hence using gem_mmap_device_coherent() which wraps the mmap options in
the order of gem_mmap_offset / gem_mmap / mmap_gtt
Incase of fencing/gtt related tests, we mandate the existance of the
mmap_gtt.
v2:
3 tests are skipped based on mappable aperture and tiling support
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
tests/i915/i915_pm_rpm.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index 3d7343240802..5ad2d833d53b 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -1535,7 +1535,7 @@ static void fill_igt_fb(struct igt_fb *fb, uint32_t color)
int i;
uint32_t *ptr;
- ptr = gem_mmap__gtt(drm_fd, fb->gem_handle, fb->size, PROT_WRITE);
+ ptr = gem_mmap__device_coherent(drm_fd, fb->gem_handle, 0, fb->size, PROT_WRITE);
for (i = 0; i < fb->size/sizeof(uint32_t); i++)
ptr[i] = color;
igt_assert(munmap(ptr, fb->size) == 0);
@@ -2016,16 +2016,20 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
/* GEM */
igt_subtest("gem-mmap-cpu")
gem_mmap_subtest(false);
- igt_subtest("gem-mmap-gtt")
+ igt_subtest("gem-mmap-gtt") {
+ gem_require_mappable_ggtt(drm_fd);
gem_mmap_subtest(true);
+ }
igt_subtest("gem-pread")
gem_pread_subtest();
igt_subtest("gem-execbuf")
gem_execbuf_subtest();
igt_subtest("gem-idle")
gem_idle_subtest();
- igt_subtest("gem-evict-pwrite")
+ igt_subtest("gem-evict-pwrite") {
+ gem_require_mappable_ggtt(drm_fd);
gem_evict_pwrite_subtest();
+ }
/* Planes and cursors */
igt_subtest("cursor")
@@ -2058,10 +2062,14 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
dpms_mode_unset_subtest(SCREEN_TYPE_LPSP);
igt_subtest("dpms-mode-unset-non-lpsp")
dpms_mode_unset_subtest(SCREEN_TYPE_NON_LPSP);
- igt_subtest("fences")
+ igt_subtest("fences") {
+ gem_require_mappable_ggtt(drm_fd);
fences_subtest(false);
- igt_subtest("fences-dpms")
+ }
+ igt_subtest("fences-dpms") {
+ gem_require_mappable_ggtt(drm_fd);
fences_subtest(true);
+ }
/* Modeset stress */
igt_subtest("modeset-lpsp-stress")
@@ -2102,10 +2110,14 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
gem_execbuf_stress_subtest(rounds, WAIT_STATUS | WAIT_EXTRA);
/* power-wake reference tests */
- igt_subtest("pm-tiling")
+ igt_subtest("pm-tiling") {
+ gem_require_mappable_ggtt(drm_fd);
pm_test_tiling();
- igt_subtest("pm-caching")
+ }
+ igt_subtest("pm-caching") {
+ gem_require_mappable_ggtt(drm_fd);
pm_test_caching();
+ }
igt_fixture
teardown_environment();
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-02-07 13:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 13:45 [igt-dev] [PATCH i-g-t v2 1/2] tests/intel_dp_compliance: use device coherent mapping instead of mmap_gtt Ramalingam C
2020-02-07 13:45 ` Ramalingam C [this message]
2020-02-07 14:44 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/i915_pm_rpm: " Chris Wilson
2020-02-10 5:47 ` Ramalingam C
2020-02-10 6:36 ` Dixit, Ashutosh
2020-02-17 9:40 ` [igt-dev] [PATCH i-g-t] tests/i915_pm_rpm: mmap type based dynamic subtests Ramalingam C
2020-02-17 9:44 ` Ramalingam C
2020-02-18 7:45 ` Chris Wilson
2020-02-18 9:07 ` C, Ramalingam
2020-02-18 10:59 ` Chris Wilson
2020-02-18 11:45 ` Chris Wilson
2020-03-10 3:27 ` [igt-dev] [PATCH i-g-t v2 2/2] tests/i915_pm_rpm: use device coherent mapping instead of mmap_gtt Dixit, Ashutosh
2020-02-07 15:05 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/2] tests/intel_dp_compliance: " Patchwork
2020-02-08 3:27 ` [igt-dev] [PATCH i-g-t v2 1/2] " Dixit, Ashutosh
2020-02-10 15:32 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,v2,1/2] " Patchwork
2020-02-17 11:25 ` [igt-dev] ✗ GitLab.Pipeline: failure for series starting with [i-g-t,v2,1/2] tests/intel_dp_compliance: use device coherent mapping instead of mmap_gtt (rev2) Patchwork
2020-02-17 14:19 ` [igt-dev] ✓ Fi.CI.BAT: success " 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=20200207134527.17205-2-ramalingam.c@intel.com \
--to=ramalingam.c@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 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.