* [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks
@ 2018-02-24 19:14 Chris Wilson
2018-02-24 19:30 ` Chris Wilson
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Chris Wilson @ 2018-02-24 19:14 UTC (permalink / raw)
To: intel-gfx
Although we want to specify exactly which physical engine to run on, the
busy ioctl can only return the I915_EXEC_RING identifier, i.e. the
aliased I915_EXEC_BSD for vcs0/vcs1. Horrors.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
tests/gem_busy.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index 831bbab1..fcff51a2 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -166,6 +166,7 @@ static void one(int fd, unsigned ring, unsigned test_flags)
struct drm_i915_gem_relocation_entry store[1024+1];
struct drm_i915_gem_execbuffer2 execbuf;
unsigned size = ALIGN(ARRAY_SIZE(store)*16 + 4, 4096);
+ const unsigned uabi = ring & 63;
uint32_t read[2], write[2];
struct timespec tv;
uint32_t *batch, *bbe;
@@ -267,11 +268,11 @@ static void one(int fd, unsigned ring, unsigned test_flags)
timeout = 1;
}
- igt_assert_eq(write[SCRATCH], ring);
- igt_assert_eq_u32(read[SCRATCH], 1 << ring);
+ igt_assert_eq(write[SCRATCH], uabi);
+ igt_assert_eq_u32(read[SCRATCH], 1 << uabi);
igt_assert_eq(write[BATCH], 0);
- igt_assert_eq_u32(read[BATCH], 1 << ring);
+ igt_assert_eq_u32(read[BATCH], 1 << uabi);
/* Calling busy in a loop should be enough to flush the rendering */
memset(&tv, 0, sizeof(tv));
--
2.16.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks
2018-02-24 19:14 [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks Chris Wilson
@ 2018-02-24 19:30 ` Chris Wilson
2018-02-25 13:44 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-02-24 19:30 UTC (permalink / raw)
To: intel-gfx
Quoting Chris Wilson (2018-02-24 19:14:00)
> Although we want to specify exactly which physical engine to run on, the
> busy ioctl can only return the I915_EXEC_RING identifier, i.e. the
> aliased I915_EXEC_BSD for vcs0/vcs1. Horrors.
Fixes: 305ebcedc36e ("Iterate over physical engines")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> tests/gem_busy.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tests/gem_busy.c b/tests/gem_busy.c
> index 831bbab1..fcff51a2 100644
> --- a/tests/gem_busy.c
> +++ b/tests/gem_busy.c
> @@ -166,6 +166,7 @@ static void one(int fd, unsigned ring, unsigned test_flags)
> struct drm_i915_gem_relocation_entry store[1024+1];
> struct drm_i915_gem_execbuffer2 execbuf;
> unsigned size = ALIGN(ARRAY_SIZE(store)*16 + 4, 4096);
> + const unsigned uabi = ring & 63;
> uint32_t read[2], write[2];
> struct timespec tv;
> uint32_t *batch, *bbe;
> @@ -267,11 +268,11 @@ static void one(int fd, unsigned ring, unsigned test_flags)
> timeout = 1;
> }
>
> - igt_assert_eq(write[SCRATCH], ring);
> - igt_assert_eq_u32(read[SCRATCH], 1 << ring);
> + igt_assert_eq(write[SCRATCH], uabi);
> + igt_assert_eq_u32(read[SCRATCH], 1 << uabi);
>
> igt_assert_eq(write[BATCH], 0);
> - igt_assert_eq_u32(read[BATCH], 1 << ring);
> + igt_assert_eq_u32(read[BATCH], 1 << uabi);
>
> /* Calling busy in a loop should be enough to flush the rendering */
> memset(&tv, 0, sizeof(tv));
> --
> 2.16.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✓ Fi.CI.BAT: success for igt/gem_busy: Fix extended-bsd aliasing checks
2018-02-24 19:14 [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks Chris Wilson
2018-02-24 19:30 ` Chris Wilson
@ 2018-02-25 13:44 ` Patchwork
2018-02-25 14:45 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-02-26 9:17 ` [PATCH igt] " Tvrtko Ursulin
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-02-25 13:44 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: igt/gem_busy: Fix extended-bsd aliasing checks
URL : https://patchwork.freedesktop.org/series/38920/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
305ebcedc36e98f3118ac27a5bbde0ce7cd71a74 Iterate over physical engines
with latest DRM-Tip kernel build CI_DRM_3830
316ba650abe6 drm-tip: 2018y-02m-23d-16h-41m-52s UTC integration manifest
No testlist changes.
Test kms_chamelium:
Subgroup dp-edid-read:
fail -> PASS (fi-kbl-7500u) fdo#102505
Test kms_force_connector_basic:
Subgroup force-connector-state:
skip -> PASS (fi-snb-2520m)
Subgroup force-edid:
skip -> PASS (fi-snb-2520m)
Subgroup force-load-detect:
skip -> PASS (fi-snb-2520m)
Subgroup prune-stale-modes:
skip -> PASS (fi-snb-2520m)
fdo#102505 https://bugs.freedesktop.org/show_bug.cgi?id=102505
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:421s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:422s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:488s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:285s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:469s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:460s
fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:390s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:562s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:414s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:295s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:507s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:387s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:409s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:464s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:494s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:448s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:494s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:592s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:429s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:525s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:491s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:471s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:408s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:430s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:531s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1001/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✗ Fi.CI.IGT: warning for igt/gem_busy: Fix extended-bsd aliasing checks
2018-02-24 19:14 [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks Chris Wilson
2018-02-24 19:30 ` Chris Wilson
2018-02-25 13:44 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-02-25 14:45 ` Patchwork
2018-02-26 9:17 ` [PATCH igt] " Tvrtko Ursulin
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-02-25 14:45 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: igt/gem_busy: Fix extended-bsd aliasing checks
URL : https://patchwork.freedesktop.org/series/38920/
State : warning
== Summary ==
Test drv_suspend:
Subgroup fence-restore-tiled2untiled:
skip -> PASS (shard-hsw)
Test kms_plane:
Subgroup plane-position-hole-dpms-pipe-b-planes:
fail -> PASS (shard-apl)
Test kms_flip:
Subgroup wf_vblank-ts-check-interruptible:
pass -> FAIL (shard-apl) fdo#100368 +1
Test kms_chv_cursor_fail:
Subgroup pipe-a-64x64-top-edge:
fail -> PASS (shard-apl)
Test gem_exec_async:
Subgroup concurrent-writes-bsd1:
pass -> SKIP (shard-hsw)
pass -> SKIP (shard-apl)
Subgroup concurrent-writes-bsd2:
pass -> SKIP (shard-hsw)
pass -> SKIP (shard-apl)
Test kms_rotation_crc:
Subgroup primary-rotation-180:
pass -> FAIL (shard-snb) fdo#103925
Test kms_sysfs_edid_timing:
pass -> WARN (shard-apl) fdo#100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
shard-apl total:3465 pass:1818 dwarn:1 dfail:0 fail:12 skip:1633 time:12330s
shard-hsw total:3465 pass:1766 dwarn:1 dfail:0 fail:3 skip:1694 time:11579s
shard-snb total:3465 pass:1358 dwarn:1 dfail:0 fail:3 skip:2103 time:6695s
Blacklisted hosts:
shard-kbl total:3457 pass:1921 dwarn:16 dfail:2 fail:11 skip:1506 time:9410s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1001/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks
2018-02-24 19:14 [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks Chris Wilson
` (2 preceding siblings ...)
2018-02-25 14:45 ` ✗ Fi.CI.IGT: warning " Patchwork
@ 2018-02-26 9:17 ` Tvrtko Ursulin
3 siblings, 0 replies; 5+ messages in thread
From: Tvrtko Ursulin @ 2018-02-26 9:17 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 24/02/2018 19:14, Chris Wilson wrote:
> Although we want to specify exactly which physical engine to run on, the
> busy ioctl can only return the I915_EXEC_RING identifier, i.e. the
> aliased I915_EXEC_BSD for vcs0/vcs1. Horrors.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> tests/gem_busy.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tests/gem_busy.c b/tests/gem_busy.c
> index 831bbab1..fcff51a2 100644
> --- a/tests/gem_busy.c
> +++ b/tests/gem_busy.c
> @@ -166,6 +166,7 @@ static void one(int fd, unsigned ring, unsigned test_flags)
> struct drm_i915_gem_relocation_entry store[1024+1];
> struct drm_i915_gem_execbuffer2 execbuf;
> unsigned size = ALIGN(ARRAY_SIZE(store)*16 + 4, 4096);
> + const unsigned uabi = ring & 63;
> uint32_t read[2], write[2];
> struct timespec tv;
> uint32_t *batch, *bbe;
> @@ -267,11 +268,11 @@ static void one(int fd, unsigned ring, unsigned test_flags)
> timeout = 1;
> }
>
> - igt_assert_eq(write[SCRATCH], ring);
> - igt_assert_eq_u32(read[SCRATCH], 1 << ring);
> + igt_assert_eq(write[SCRATCH], uabi);
> + igt_assert_eq_u32(read[SCRATCH], 1 << uabi);
>
> igt_assert_eq(write[BATCH], 0);
> - igt_assert_eq_u32(read[BATCH], 1 << ring);
> + igt_assert_eq_u32(read[BATCH], 1 << uabi);
>
> /* Calling busy in a loop should be enough to flush the rendering */
> memset(&tv, 0, sizeof(tv));
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-26 9:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-24 19:14 [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks Chris Wilson
2018-02-24 19:30 ` Chris Wilson
2018-02-25 13:44 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-02-25 14:45 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-02-26 9:17 ` [PATCH igt] " Tvrtko Ursulin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox