From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t 1/2] tests/gem_exec_reloc: Don't filter out addresses when on PPGTT
Date: Wed, 23 Oct 2019 11:07:51 +0200 [thread overview]
Message-ID: <20191023090752.23566-1-janusz.krzysztofik@linux.intel.com> (raw)
Commit a355b2d6eb42 ("igt/gem_exec_reloc: Filter out unavailable
addresses for !ppgtt") introduced filtering of addresses possibly
occupied by other users of shared GTT. Unfortunately, that filtering
is unconditional, no matter if running on old shared GTT or not. When
running on PPGTT, that may result in errors other than those intended
to be skipped over being silently ignored.
Skip over unavailable addresses only when not running on PPGTT.
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
tests/i915/gem_exec_reloc.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index fdd9661d..8f88826e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -539,12 +539,13 @@ static void basic_range(int fd, unsigned flags)
obj[n].offset = (1ull << (i + 12)) - 4096;
obj[n].offset = gen8_canonical_address(obj[n].offset);
obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
- gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
- execbuf.buffers_ptr = to_user_pointer(&obj[n]);
- execbuf.buffer_count = 1;
- if (__gem_execbuf(fd, &execbuf))
- continue;
-
+ if (!gem_uses_ppgtt(fd)) {
+ gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
+ execbuf.buffers_ptr = to_user_pointer(&obj[n]);
+ execbuf.buffer_count = 1;
+ if (__gem_execbuf(fd, &execbuf))
+ continue;
+ }
igt_debug("obj[%d] handle=%d, address=%llx\n",
n, obj[n].handle, (long long)obj[n].offset);
@@ -559,12 +560,13 @@ static void basic_range(int fd, unsigned flags)
obj[n].offset = 1ull << (i + 12);
obj[n].offset = gen8_canonical_address(obj[n].offset);
obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
- gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
- execbuf.buffers_ptr = to_user_pointer(&obj[n]);
- execbuf.buffer_count = 1;
- if (__gem_execbuf(fd, &execbuf))
- continue;
-
+ if (!gem_uses_ppgtt(fd)) {
+ gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
+ execbuf.buffers_ptr = to_user_pointer(&obj[n]);
+ execbuf.buffer_count = 1;
+ if (__gem_execbuf(fd, &execbuf))
+ continue;
+ }
igt_debug("obj[%d] handle=%d, address=%llx\n",
n, obj[n].handle, (long long)obj[n].offset);
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH i-g-t 1/2] tests/gem_exec_reloc: Don't filter out addresses when on PPGTT
Date: Wed, 23 Oct 2019 11:07:51 +0200 [thread overview]
Message-ID: <20191023090752.23566-1-janusz.krzysztofik@linux.intel.com> (raw)
Message-ID: <20191023090751.tAuvmSPOcnAeLKhIj5cKVe2IHkXHngxDsKd-HAb0Vd0@z> (raw)
Commit a355b2d6eb42 ("igt/gem_exec_reloc: Filter out unavailable
addresses for !ppgtt") introduced filtering of addresses possibly
occupied by other users of shared GTT. Unfortunately, that filtering
is unconditional, no matter if running on old shared GTT or not. When
running on PPGTT, that may result in errors other than those intended
to be skipped over being silently ignored.
Skip over unavailable addresses only when not running on PPGTT.
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
tests/i915/gem_exec_reloc.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index fdd9661d..8f88826e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -539,12 +539,13 @@ static void basic_range(int fd, unsigned flags)
obj[n].offset = (1ull << (i + 12)) - 4096;
obj[n].offset = gen8_canonical_address(obj[n].offset);
obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
- gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
- execbuf.buffers_ptr = to_user_pointer(&obj[n]);
- execbuf.buffer_count = 1;
- if (__gem_execbuf(fd, &execbuf))
- continue;
-
+ if (!gem_uses_ppgtt(fd)) {
+ gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
+ execbuf.buffers_ptr = to_user_pointer(&obj[n]);
+ execbuf.buffer_count = 1;
+ if (__gem_execbuf(fd, &execbuf))
+ continue;
+ }
igt_debug("obj[%d] handle=%d, address=%llx\n",
n, obj[n].handle, (long long)obj[n].offset);
@@ -559,12 +560,13 @@ static void basic_range(int fd, unsigned flags)
obj[n].offset = 1ull << (i + 12);
obj[n].offset = gen8_canonical_address(obj[n].offset);
obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
- gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
- execbuf.buffers_ptr = to_user_pointer(&obj[n]);
- execbuf.buffer_count = 1;
- if (__gem_execbuf(fd, &execbuf))
- continue;
-
+ if (!gem_uses_ppgtt(fd)) {
+ gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe));
+ execbuf.buffers_ptr = to_user_pointer(&obj[n]);
+ execbuf.buffer_count = 1;
+ if (__gem_execbuf(fd, &execbuf))
+ continue;
+ }
igt_debug("obj[%d] handle=%d, address=%llx\n",
n, obj[n].handle, (long long)obj[n].offset);
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-10-23 9:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 9:07 Janusz Krzysztofik [this message]
2019-10-23 9:07 ` [Intel-gfx] [PATCH i-g-t 1/2] tests/gem_exec_reloc: Don't filter out addresses when on PPGTT Janusz Krzysztofik
2019-10-23 9:07 ` [PATCH i-g-t 2/2] tests/gem_exec_reloc: Calculate softpin offsets from batch size Janusz Krzysztofik
2019-10-23 9:07 ` [Intel-gfx] " Janusz Krzysztofik
2019-10-23 9:13 ` Chris Wilson
2019-10-23 9:13 ` [Intel-gfx] " Chris Wilson
2019-10-23 9:16 ` Janusz Krzysztofik
2019-10-23 9:16 ` [Intel-gfx] " Janusz Krzysztofik
2019-10-23 9:11 ` [PATCH i-g-t 1/2] tests/gem_exec_reloc: Don't filter out addresses when on PPGTT Chris Wilson
2019-10-23 9:11 ` [igt-dev] " Chris Wilson
2019-10-23 9:11 ` [Intel-gfx] " Chris Wilson
2019-10-23 9:18 ` Janusz Krzysztofik
2019-10-23 9:18 ` [Intel-gfx] " Janusz Krzysztofik
2019-10-23 10:39 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] " 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=20191023090752.23566-1-janusz.krzysztofik@linux.intel.com \
--to=janusz.krzysztofik@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=intel-gfx@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.