* [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd
@ 2015-09-03 9:05 Thomas Wood
2015-09-03 9:05 ` [PATCH i-g-t 2/2] tests/gem_storedw_loop: remove redundant ppgtt check Thomas Wood
2015-09-04 8:15 ` [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Daniel Vetter
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Wood @ 2015-09-03 9:05 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
tests/gem_storedw_loop.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
index 2263397..1bb276e 100644
--- a/tests/gem_storedw_loop.c
+++ b/tests/gem_storedw_loop.c
@@ -144,6 +144,14 @@ struct ring {
{ "vebox", I915_EXEC_VEBOX },
};
+static void
+check_test_requirements(int fd, int ringid)
+{
+ gem_require_ring(fd, ringid);
+ igt_skip_on_f(intel_gen(devid) == 6 && ringid == I915_EXEC_BSD,
+ "MI_STORE_DATA broken on gen6 bsd\n");
+}
+
igt_main
{
int fd, i;
@@ -166,13 +174,14 @@ igt_main
}
for (i = 0; i < ARRAY_SIZE(rings); i++) {
+
igt_subtest_f("basic-%s", rings[i].name) {
- gem_require_ring(fd, rings[i].id);
+ check_test_requirements(fd, rings[i].id);
store_test(rings[i].id, 16*1024);
}
igt_subtest_f("long-%s", rings[i].name) {
- gem_require_ring(fd, rings[i].id);
+ check_test_requirements(fd, rings[i].id);
store_test(rings[i].id, 1024*1024);
}
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH i-g-t 2/2] tests/gem_storedw_loop: remove redundant ppgtt check
2015-09-03 9:05 [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Thomas Wood
@ 2015-09-03 9:05 ` Thomas Wood
2015-09-04 8:15 ` [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Daniel Vetter
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Wood @ 2015-09-03 9:05 UTC (permalink / raw)
To: intel-gfx
All tests require ppgtt, so checking for it later on has no effect.
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
tests/gem_storedw_loop.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
index 1bb276e..08a6ad6 100644
--- a/tests/gem_storedw_loop.c
+++ b/tests/gem_storedw_loop.c
@@ -45,7 +45,6 @@ IGT_TEST_DESCRIPTION("Basic CS check using MI_STORE_DATA_IMM.");
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
static drm_intel_bo *target_buffer;
-static int has_ppgtt = 0;
static int devid;
/*
@@ -57,8 +56,6 @@ emit_store_dword_imm(drm_intel_bo *dest, uint32_t val)
{
int cmd;
cmd = MI_STORE_DWORD_IMM;
- if (!has_ppgtt)
- cmd |= MI_MEM_VIRTUAL;
BEGIN_BATCH(4, 0);
OUT_BATCH(cmd);
@@ -163,14 +160,12 @@ igt_main
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
igt_assert(bufmgr);
- has_ppgtt = gem_uses_aliasing_ppgtt(fd);
-
igt_skip_on_f(intel_gen(devid) < 6,
"MI_STORE_DATA can only use GTT address on gen4+/g33 and "
"needs snoopable mem on pre-gen6\n");
/* This only works with ppgtt */
- igt_require(has_ppgtt);
+ igt_require(gem_uses_aliasing_ppgtt(fd));
}
for (i = 0; i < ARRAY_SIZE(rings); i++) {
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd
2015-09-03 9:05 [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Thomas Wood
2015-09-03 9:05 ` [PATCH i-g-t 2/2] tests/gem_storedw_loop: remove redundant ppgtt check Thomas Wood
@ 2015-09-04 8:15 ` Daniel Vetter
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2015-09-04 8:15 UTC (permalink / raw)
To: Thomas Wood; +Cc: intel-gfx
On Thu, Sep 03, 2015 at 10:05:27AM +0100, Thomas Wood wrote:
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Bit more commit message would be good, just copypaste the debug output ;-)
lgtm otherwise on the patch series.
-Daniel
> ---
> tests/gem_storedw_loop.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
> index 2263397..1bb276e 100644
> --- a/tests/gem_storedw_loop.c
> +++ b/tests/gem_storedw_loop.c
> @@ -144,6 +144,14 @@ struct ring {
> { "vebox", I915_EXEC_VEBOX },
> };
>
> +static void
> +check_test_requirements(int fd, int ringid)
> +{
> + gem_require_ring(fd, ringid);
> + igt_skip_on_f(intel_gen(devid) == 6 && ringid == I915_EXEC_BSD,
> + "MI_STORE_DATA broken on gen6 bsd\n");
> +}
> +
> igt_main
> {
> int fd, i;
> @@ -166,13 +174,14 @@ igt_main
> }
>
> for (i = 0; i < ARRAY_SIZE(rings); i++) {
> +
> igt_subtest_f("basic-%s", rings[i].name) {
> - gem_require_ring(fd, rings[i].id);
> + check_test_requirements(fd, rings[i].id);
> store_test(rings[i].id, 16*1024);
> }
>
> igt_subtest_f("long-%s", rings[i].name) {
> - gem_require_ring(fd, rings[i].id);
> + check_test_requirements(fd, rings[i].id);
> store_test(rings[i].id, 1024*1024);
> }
> }
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-04 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-03 9:05 [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Thomas Wood
2015-09-03 9:05 ` [PATCH i-g-t 2/2] tests/gem_storedw_loop: remove redundant ppgtt check Thomas Wood
2015-09-04 8:15 ` [PATCH i-g-t 1/2] tests/gem_storedw_loop: skip on gen6 bsd Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox