* [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync
@ 2019-09-25 13:45 Chris Wilson
2019-09-25 13:45 ` [igt-dev] [PATCH i-g-t 2/2] Add i915/gem_ctx_persistence Chris Wilson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2019-09-25 13:45 UTC (permalink / raw)
To: intel-gfx; +Cc: igt-dev, andi
Update to commit fef476f3ab47527a00818ddaf4b46b8c09361111 (not upstream!)
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Aug 5 22:55:44 2019 +0100
drm/i915: Cancel non-persistent contexts on close
for I915_CONTEXT_PARAM_PERSISTENCE
---
include/drm-uapi/i915_drm.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
index 761517f15..7badfa0b1 100644
--- a/include/drm-uapi/i915_drm.h
+++ b/include/drm-uapi/i915_drm.h
@@ -521,6 +521,7 @@ typedef struct drm_i915_irq_wait {
#define I915_SCHEDULER_CAP_PRIORITY (1ul << 1)
#define I915_SCHEDULER_CAP_PREEMPTION (1ul << 2)
#define I915_SCHEDULER_CAP_SEMAPHORES (1ul << 3)
+#define I915_SCHEDULER_CAP_ENGINE_BUSY_STATS (1ul << 4)
#define I915_PARAM_HUC_STATUS 42
@@ -1564,6 +1565,21 @@ struct drm_i915_gem_context_param {
* i915_context_engines_bond (I915_CONTEXT_ENGINES_EXT_BOND)
*/
#define I915_CONTEXT_PARAM_ENGINES 0xa
+
+/*
+ * I915_CONTEXT_PARAM_PERSISTENCE:
+ *
+ * Allow the context and active rendering to survive the process until
+ * completion. Persistence allows fire-and-forget clients to queue up a
+ * bunch of work, hand the output over to a display server and the quit.
+ * If the context is not marked as persistent, upon closing (either via
+ * an explicit DRM_I915_GEM_CONTEXT_DESTROY or implicitly from file closure
+ * or process termination), the context and any outstanding requests will be
+ * cancelled (and exported fences for cancelled requests marked as -EIO).
+ *
+ * By default, new contexts allow persistence.
+ */
+#define I915_CONTEXT_PARAM_PERSISTENCE 0xb
/* Must be kept compact -- no holes and well documented */
__u64 value;
@@ -2032,8 +2048,10 @@ struct drm_i915_query {
* (data[X / 8] >> (X % 8)) & 1
*
* - the subslice mask for each slice with one bit per subslice telling
- * whether a subslice is available. The availability of subslice Y in slice
- * X can be queried with the following formula :
+ * whether a subslice is available. Gen12 has dual-subslices, which are
+ * similar to two gen11 subslices. For gen12, this array represents dual-
+ * subslices. The availability of subslice Y in slice X can be queried
+ * with the following formula :
*
* (data[subslice_offset +
* X * subslice_stride +
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* [igt-dev] [PATCH i-g-t 2/2] Add i915/gem_ctx_persistence 2019-09-25 13:45 [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync Chris Wilson @ 2019-09-25 13:45 ` Chris Wilson 2019-09-25 14:17 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] i915_drm.h sync Patchwork 2019-09-25 14:24 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork 2 siblings, 0 replies; 5+ messages in thread From: Chris Wilson @ 2019-09-25 13:45 UTC (permalink / raw) To: intel-gfx; +Cc: igt-dev, Jon Bloomfield, andi Sanity test existing persistence and new exciting non-persistent context behaviour. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Jon Bloomfield <jon.bloomfield@intel.com> --- lib/i915/gem_context.c | 37 ++++ lib/i915/gem_context.h | 8 + lib/igt_dummyload.c | 3 +- lib/ioctl_wrappers.c | 1 + tests/Makefile.sources | 3 + tests/i915/gem_ctx_persistence.c | 353 +++++++++++++++++++++++++++++++ tests/meson.build | 1 + 7 files changed, 405 insertions(+), 1 deletion(-) create mode 100644 tests/i915/gem_ctx_persistence.c diff --git a/lib/i915/gem_context.c b/lib/i915/gem_context.c index 83c5df961..1fae5191f 100644 --- a/lib/i915/gem_context.c +++ b/lib/i915/gem_context.c @@ -272,6 +272,43 @@ void gem_context_set_priority(int fd, uint32_t ctx_id, int prio) igt_assert_eq(__gem_context_set_priority(fd, ctx_id, prio), 0); } +/** + * __gem_context_set_persistence: + * @i915: open i915 drm file descriptor + * @ctx: i915 context id + * @state: desired persistence + * + * Declare whether this context is allowed to persist after closing until + * its requests are complete (persistent=true) or if it should be + * immediately reaped on closing and its requests cancelled + * (persistent=false). + * + * Returns: An integer equal to zero for success and negative for failure + */ +int __gem_context_set_persistence(int i915, uint32_t ctx, bool state) +{ + struct drm_i915_gem_context_param p = { + .ctx_id = ctx, + .param = I915_CONTEXT_PARAM_PERSISTENCE, + .value = state, + }; + + return __gem_context_set_param(i915, &p); +} + +/** + * __gem_context_set_persistence: + * @i915: open i915 drm file descriptor + * @ctx: i915 context id + * @state: desired persistence + * + * Like __gem_context_set_persistence(), except we assert on failure. + */ +void gem_context_set_persistence(int i915, uint32_t ctx, bool state) +{ + igt_assert_eq(__gem_context_set_persistence(i915, ctx, state), 0); +} + int __gem_context_clone(int i915, uint32_t src, unsigned int share, diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h index 8043c3401..c0d4c9615 100644 --- a/lib/i915/gem_context.h +++ b/lib/i915/gem_context.h @@ -24,6 +24,11 @@ #ifndef GEM_CONTEXT_H #define GEM_CONTEXT_H +#include <stdbool.h> +#include <stdint.h> + +struct drm_i915_gem_context_param; + uint32_t gem_context_create(int fd); int __gem_context_create(int fd, uint32_t *ctx_id); void gem_context_destroy(int fd, uint32_t ctx_id); @@ -58,6 +63,9 @@ int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p); int __gem_context_set_priority(int fd, uint32_t ctx, int prio); void gem_context_set_priority(int fd, uint32_t ctx, int prio); +int __gem_context_set_persistence(int i915, uint32_t ctx, bool state); +void gem_context_set_persistence(int i915, uint32_t ctx, bool state); + bool gem_context_has_engine(int fd, uint32_t ctx, uint64_t engine); #endif /* GEM_CONTEXT_H */ diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c index 65b5cc927..6060878dd 100644 --- a/lib/igt_dummyload.c +++ b/lib/igt_dummyload.c @@ -450,7 +450,8 @@ void igt_spin_free(int fd, igt_spin_t *spin) gem_close(fd, spin->poll_handle); } - gem_close(fd, spin->handle); + if (spin->handle) + gem_close(fd, spin->handle); if (spin->out_fence >= 0) close(spin->out_fence); diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 280fdd624..628f8b830 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -445,6 +445,7 @@ int gem_wait(int fd, uint32_t handle, int64_t *timeout_ns) ret = 0; if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_WAIT, &wait)) ret = -errno; + errno = 0; if (timeout_ns) *timeout_ns = wait.timeout_ns; diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 343be0500..093eb57f3 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -154,6 +154,9 @@ gem_ctx_isolation_SOURCES = i915/gem_ctx_isolation.c TESTS_progs += gem_ctx_param gem_ctx_param_SOURCES = i915/gem_ctx_param.c +TESTS_progs += gem_ctx_persistence +gem_ctx_persistence_SOURCES = i915/gem_ctx_persistence.c + TESTS_progs += gem_ctx_shared gem_ctx_shared_SOURCES = i915/gem_ctx_shared.c diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c new file mode 100644 index 000000000..d6ef6b900 --- /dev/null +++ b/tests/i915/gem_ctx_persistence.c @@ -0,0 +1,353 @@ +/* + * Copyright © 2019 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include <errno.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <unistd.h> + +#include "drmtest.h" /* gem_quiescent_gpu()! */ +#include "i915/gem_context.h" +#include "i915/gem_submission.h" +#include "igt_debugfs.h" +#include "igt_dummyload.h" +#include "ioctl_wrappers.h" /* gem_wait()! */ +#include "sw_sync.h" + +static bool has_persistence(int i915) +{ + struct drm_i915_gem_context_param p = { + .param = I915_CONTEXT_PARAM_PERSISTENCE, + }; + uint64_t saved; + + if (__gem_context_get_param(i915, &p)) + return false; + + saved = p.value; + p.value = 0; + if (__gem_context_set_param(i915, &p)) + return false; + + p.value = saved; + return __gem_context_set_param(i915, &p) == 0; +} + +static void test_idempotent(int i915) +{ + struct drm_i915_gem_context_param p = { + .param = I915_CONTEXT_PARAM_PERSISTENCE, + }; + int expected; + + /* + * Simple test to verify that we are able to read back the same boolean + * value as we set. + * + * Each time we invert the current value so that at the end of the test, + * if successful, we leave the context in the original state. + */ + + gem_context_get_param(i915, &p); + expected = !!p.value; + + expected = !expected; + p.value = expected; + gem_context_set_param(i915, &p); + gem_context_get_param(i915, &p); + igt_assert_eq(p.value, expected); + + expected = !expected; /* and restores */ + p.value = expected; + gem_context_set_param(i915, &p); + gem_context_get_param(i915, &p); + igt_assert_eq(p.value, expected); +} + +static void test_persistence(int i915) +{ + igt_spin_t *spin; + int64_t timeout; + uint32_t ctx; + + /* + * Default behaviour are contexts remain alive until their last active + * request is retired -- no early termination. + */ + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, true); + + spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_FENCE_OUT); + gem_context_destroy(i915, ctx); + + timeout = NSEC_PER_SEC / 5; + igt_assert_eq(gem_wait(i915, spin->handle, &timeout), -ETIME); + + igt_spin_end(spin); + + timeout = NSEC_PER_SEC / 5; + igt_assert_eq(gem_wait(i915, spin->handle, &timeout), 0); + igt_assert_eq(sync_fence_status(spin->out_fence), 1); + + igt_spin_free(i915, spin); + gem_quiescent_gpu(i915); +} + +static void test_nonpersistent_cleanup(int i915) +{ + int64_t timeout = NSEC_PER_SEC / 5; + igt_spin_t *spin; + uint32_t ctx; + + /* + * A nonpersistent context is terminated immediately upon closure, + * any inflight request is cancelled. + */ + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, false); + + spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_FENCE_OUT); + gem_context_destroy(i915, ctx); + + igt_assert_eq(gem_wait(i915, spin->handle, &timeout), 0); + igt_assert_eq(sync_fence_status(spin->out_fence), -EIO); + + igt_spin_free(i915, spin); + gem_quiescent_gpu(i915); +} + +static void test_nonpersistent_mixed(int i915) +{ + int fence[3]; + + /* + * Only a nonpersistent context is terminated immediately upon + * closure, any inflight request is cancelled. If there is also + * an active persistent context closed, it should be unafffected. + */ + + for (int i = 0; i < ARRAY_SIZE(fence); i++) { + igt_spin_t *spin; + uint32_t ctx; + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, i & 1); + + spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_FENCE_OUT); + gem_context_destroy(i915, ctx); + + fence[i] = spin->out_fence; + } + + /* Outer pair of contexts were non-persistent and killed */ + igt_assert_eq(sync_fence_wait(fence[0], MSEC_PER_SEC / 5), 0); + igt_assert_eq(sync_fence_status(fence[0]), -EIO); + + igt_assert_eq(sync_fence_wait(fence[2], MSEC_PER_SEC / 5), 0); + igt_assert_eq(sync_fence_status(fence[2]), -EIO); + + /* But the middle context is still running */ + igt_assert_eq(sync_fence_wait(fence[1], 0), -ETIME); + + gem_quiescent_gpu(i915); +} + +static void test_nonpersistent_hostile(int i915) +{ + int64_t timeout = NSEC_PER_SEC / 2; + igt_spin_t *spin; + uint32_t ctx; + + /* + * If we cannot cleanly cancel the persistent context on closure, + * e.g. preemption fails, we are forced to reset the GPU to terminate + * the requests and cleanup the context. + */ + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, false); + + spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_NO_PREEMPTION); + gem_context_destroy(i915, ctx); + + igt_assert_eq(gem_wait(i915, spin->handle, &timeout), 0); + + igt_spin_free(i915, spin); + gem_quiescent_gpu(i915); +} + +static void test_nonpersistent_file(int i915) +{ + igt_spin_t *spin; + uint32_t ctx; + + /* + * A context may live beyond its initial struct file, except if it + * has been made nonpersistent, in which case it must be terminated. + */ + + i915 = gem_reopen_driver(i915); + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, false); + + spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_FENCE_OUT); + close(i915); + + igt_assert_eq(sync_fence_wait(spin->out_fence, MSEC_PER_SEC / 5), 0); + igt_assert_eq(sync_fence_status(spin->out_fence), -EIO); + + spin->handle = 0; + igt_spin_free(-1, spin); +} + +static void sendfd(int socket, int fd) +{ + char buf[CMSG_SPACE(sizeof(fd))]; + struct iovec io = { .iov_base = (char *)"ABC", .iov_len = 3 }; + struct msghdr msg = { + .msg_iov = &io, + .msg_iovlen = 1, + .msg_control = buf, + .msg_controllen = CMSG_LEN(sizeof(fd)), + }; + struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); + + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = msg.msg_controllen; + *(int *)CMSG_DATA(cmsg) = fd; + + igt_assert(sendmsg(socket, &msg, 0) != -1); +} + +static int recvfd(int socket) +{ + char m_buffer[256], c_buffer[256]; + struct iovec io = { + .iov_base = m_buffer, + .iov_len = sizeof(m_buffer), + }; + struct msghdr msg = { + .msg_iov = &io, + .msg_iovlen = 1, + .msg_control = c_buffer, + .msg_controllen = sizeof(c_buffer), + }; + + igt_assert(recvmsg(socket, &msg, 0) != -1); + return *(int *)CMSG_DATA(CMSG_FIRSTHDR(&msg)); +} + +static void test_nonpersistent_process(int i915) +{ + int fence[2], sv[2]; + + /* + * If a process dies early, any nonpersistent contexts it had + * open must be terminated too. But any persistent contexts, + * should survive until their requests are complete. + */ + + igt_require(socketpair(AF_UNIX, SOCK_DGRAM, 0, sv) == 0); + + igt_fork(child, 1) { + i915 = gem_reopen_driver(i915); + + for (int persists = 0; persists <= 1; persists++) { + igt_spin_t *spin; + uint32_t ctx; + + ctx = gem_context_create(i915); + gem_context_set_persistence(i915, ctx, persists); + + spin = igt_spin_new(i915, ctx, + .flags = IGT_SPIN_FENCE_OUT); + + sendfd(sv[0], spin->out_fence); + + igt_list_del(&spin->link); /* prevent autocleanup */ + } + } + close(sv[0]); + igt_waitchildren(); + + fence[0] = recvfd(sv[1]); + fence[1] = recvfd(sv[1]); + close(sv[1]); + + /* First fence is non-persistent, so should be reset */ + igt_assert_eq(sync_fence_wait(fence[0], MSEC_PER_SEC / 5), 0); + igt_assert_eq(sync_fence_status(fence[0]), -EIO); + close(fence[0]); + + /* Second fence is persistent, so should be still spinning */ + igt_assert_eq(sync_fence_wait(fence[1], 0), -ETIME); + close(fence[1]); + + /* We have to manually clean up the orphaned spinner */ + igt_drop_caches_set(i915, DROP_RESET_ACTIVE); + + gem_quiescent_gpu(i915); +} + +igt_main +{ + int i915; + + igt_fixture { + i915 = drm_open_driver(DRIVER_INTEL); + igt_require_gem(i915); + + igt_require(has_persistence(i915)); + } + + igt_subtest_group { + igt_subtest("idempotent") + test_idempotent(i915); + + igt_subtest("persistence") + test_persistence(i915); + + igt_subtest("cleanup") + test_nonpersistent_cleanup(i915); + + igt_subtest("mixed") + test_nonpersistent_mixed(i915); + + igt_subtest("hostile") + test_nonpersistent_hostile(i915); + + igt_subtest("file") + test_nonpersistent_file(i915); + + igt_subtest("process") + test_nonpersistent_process(i915); + } + + igt_fixture { + close(i915); + } +} diff --git a/tests/meson.build b/tests/meson.build index 7e3f9e0a4..3f3eee277 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -121,6 +121,7 @@ i915_progs = [ 'gem_ctx_exec', 'gem_ctx_isolation', 'gem_ctx_param', + 'gem_ctx_persistence', 'gem_ctx_shared', 'gem_ctx_switch', 'gem_ctx_thrash', -- 2.23.0 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] i915_drm.h sync 2019-09-25 13:45 [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync Chris Wilson 2019-09-25 13:45 ` [igt-dev] [PATCH i-g-t 2/2] Add i915/gem_ctx_persistence Chris Wilson @ 2019-09-25 14:17 ` Patchwork 2019-09-25 14:24 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork 2 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-09-25 14:17 UTC (permalink / raw) To: Chris Wilson; +Cc: igt-dev == Series Details == Series: series starting with [i-g-t,1/2] i915_drm.h sync URL : https://patchwork.freedesktop.org/series/67220/ State : warning == Summary == ERROR! This series introduces new undocumented tests: gem_ctx_persistence gem_ctx_persistence@cleanup gem_ctx_persistence@file gem_ctx_persistence@hostile gem_ctx_persistence@idempotent gem_ctx_persistence@mixed gem_ctx_persistence@persistence gem_ctx_persistence@process Can you document them as per the requirement in the [CONTRIBUTING.md]? [Documentation] has more details on how to do this. Here are few examples: https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/0316695d03aa46108296b27f3982ec93200c7a6e https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/443cc658e1e6b492ee17bf4f4d891029eb7a205d Thanks in advance! [CONTRIBUTING.md]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/blob/master/CONTRIBUTING.md#L19 [Documentation]: https://drm.pages.freedesktop.org/igt-gpu-tools/igt-gpu-tools-Core.html#igt-describe Other than that, pipeline status: SUCCESS. see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/66404 for more details == Logs == For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/66404 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] i915_drm.h sync 2019-09-25 13:45 [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync Chris Wilson 2019-09-25 13:45 ` [igt-dev] [PATCH i-g-t 2/2] Add i915/gem_ctx_persistence Chris Wilson 2019-09-25 14:17 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] i915_drm.h sync Patchwork @ 2019-09-25 14:24 ` Patchwork 2 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-09-25 14:24 UTC (permalink / raw) To: Chris Wilson; +Cc: igt-dev == Series Details == Series: series starting with [i-g-t,1/2] i915_drm.h sync URL : https://patchwork.freedesktop.org/series/67220/ State : success == Summary == CI Bug Log - changes from CI_DRM_6956 -> IGTPW_3501 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/67220/revisions/1/mbox/ Known issues ------------ Here are the changes found in IGTPW_3501 that come from known issues: ### IGT changes ### #### Possible fixes #### * igt@gem_exec_suspend@basic-s4-devices: - fi-blb-e6850: [INCOMPLETE][1] ([fdo#107718]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6956/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3501/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html * igt@kms_chamelium@hdmi-crc-fast: - fi-kbl-7500u: [FAIL][3] ([fdo#109635 ]) -> [PASS][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6956/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3501/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html #### Warnings #### * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [FAIL][5] ([fdo#111168 ]) -> [FAIL][6] ([fdo#111407]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6956/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3501/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635 [fdo#111168 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111168 [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407 [fdo#111647]: https://bugs.freedesktop.org/show_bug.cgi?id=111647 Participating hosts (51 -> 45) ------------------------------ Additional (1): fi-tgl-u Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_5202 -> IGTPW_3501 CI-20190529: 20190529 CI_DRM_6956: e514b64998c2845943242b1d4dc2e568b01fddcb @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_3501: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3501/ IGT_5202: 3499c5eb17054e2abd88023fe962768140d24302 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Testlist changes == +igt@gem_ctx_persistence@cleanup +igt@gem_ctx_persistence@file +igt@gem_ctx_persistence@hostile +igt@gem_ctx_persistence@idempotent +igt@gem_ctx_persistence@mixed +igt@gem_ctx_persistence@persistence +igt@gem_ctx_persistence@process == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3501/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync
@ 2019-10-10 7:32 Chris Wilson
2019-10-10 8:23 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] " Patchwork
0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2019-10-10 7:32 UTC (permalink / raw)
To: intel-gfx; +Cc: igt-dev
Update to commit fef476f3ab47527a00818ddaf4b46b8c09361111 (not upstream!)
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Aug 5 22:55:44 2019 +0100
drm/i915: Cancel non-persistent contexts on close
for I915_CONTEXT_PARAM_PERSISTENCE
---
include/drm-uapi/i915_drm.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
index 761517f15..7badfa0b1 100644
--- a/include/drm-uapi/i915_drm.h
+++ b/include/drm-uapi/i915_drm.h
@@ -521,6 +521,7 @@ typedef struct drm_i915_irq_wait {
#define I915_SCHEDULER_CAP_PRIORITY (1ul << 1)
#define I915_SCHEDULER_CAP_PREEMPTION (1ul << 2)
#define I915_SCHEDULER_CAP_SEMAPHORES (1ul << 3)
+#define I915_SCHEDULER_CAP_ENGINE_BUSY_STATS (1ul << 4)
#define I915_PARAM_HUC_STATUS 42
@@ -1564,6 +1565,21 @@ struct drm_i915_gem_context_param {
* i915_context_engines_bond (I915_CONTEXT_ENGINES_EXT_BOND)
*/
#define I915_CONTEXT_PARAM_ENGINES 0xa
+
+/*
+ * I915_CONTEXT_PARAM_PERSISTENCE:
+ *
+ * Allow the context and active rendering to survive the process until
+ * completion. Persistence allows fire-and-forget clients to queue up a
+ * bunch of work, hand the output over to a display server and the quit.
+ * If the context is not marked as persistent, upon closing (either via
+ * an explicit DRM_I915_GEM_CONTEXT_DESTROY or implicitly from file closure
+ * or process termination), the context and any outstanding requests will be
+ * cancelled (and exported fences for cancelled requests marked as -EIO).
+ *
+ * By default, new contexts allow persistence.
+ */
+#define I915_CONTEXT_PARAM_PERSISTENCE 0xb
/* Must be kept compact -- no holes and well documented */
__u64 value;
@@ -2032,8 +2048,10 @@ struct drm_i915_query {
* (data[X / 8] >> (X % 8)) & 1
*
* - the subslice mask for each slice with one bit per subslice telling
- * whether a subslice is available. The availability of subslice Y in slice
- * X can be queried with the following formula :
+ * whether a subslice is available. Gen12 has dual-subslices, which are
+ * similar to two gen11 subslices. For gen12, this array represents dual-
+ * subslices. The availability of subslice Y in slice X can be queried
+ * with the following formula :
*
* (data[subslice_offset +
* X * subslice_stride +
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] i915_drm.h sync 2019-10-10 7:32 [igt-dev] [PATCH i-g-t 1/2] " Chris Wilson @ 2019-10-10 8:23 ` Patchwork 0 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-10-10 8:23 UTC (permalink / raw) To: Chris Wilson; +Cc: igt-dev == Series Details == Series: series starting with [i-g-t,1/2] i915_drm.h sync URL : https://patchwork.freedesktop.org/series/67829/ State : success == Summary == CI Bug Log - changes from CI_DRM_7047 -> IGTPW_3556 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/index.html Known issues ------------ Here are the changes found in IGTPW_3556 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_flink_basic@bad-flink: - fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7047/fi-icl-u3/igt@gem_flink_basic@bad-flink.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/fi-icl-u3/igt@gem_flink_basic@bad-flink.html * igt@i915_module_load@reload: - fi-blb-e6850: [PASS][3] -> [INCOMPLETE][4] ([fdo#107718]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7047/fi-blb-e6850/igt@i915_module_load@reload.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/fi-blb-e6850/igt@i915_module_load@reload.html * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [PASS][5] -> [FAIL][6] ([fdo#111045] / [fdo#111096]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7047/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html #### Possible fixes #### * igt@gem_flink_basic@basic: - fi-icl-u3: [DMESG-WARN][7] ([fdo#107724]) -> [PASS][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7047/fi-icl-u3/igt@gem_flink_basic@basic.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/fi-icl-u3/igt@gem_flink_basic@basic.html * igt@gem_sync@basic-many-each: - {fi-tgl-u}: [INCOMPLETE][9] ([fdo#111880]) -> [PASS][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7047/fi-tgl-u/igt@gem_sync@basic-many-each.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/fi-tgl-u/igt@gem_sync@basic-many-each.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 [fdo#111831]: https://bugs.freedesktop.org/show_bug.cgi?id=111831 [fdo#111880]: https://bugs.freedesktop.org/show_bug.cgi?id=111880 Participating hosts (51 -> 47) ------------------------------ Additional (3): fi-byt-j1900 fi-bsw-n3050 fi-pnv-d510 Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_5220 -> IGTPW_3556 CI-20190529: 20190529 CI_DRM_7047: 23ba5b1f97d3d114d30eead1ca95d5a846a9027c @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_3556: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/index.html IGT_5220: 1e38e32d721210a780198c8293a6b8c8e881df68 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Testlist changes == +igt@gem_ctx_persistence@cleanup +igt@gem_ctx_persistence@file +igt@gem_ctx_persistence@hangcheck +igt@gem_ctx_persistence@hostile +igt@gem_ctx_persistence@idempotent +igt@gem_ctx_persistence@mixed +igt@gem_ctx_persistence@persistence +igt@gem_ctx_persistence@process == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3556/index.html _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-10 8:23 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-09-25 13:45 [igt-dev] [PATCH i-g-t 1/2] i915_drm.h sync Chris Wilson 2019-09-25 13:45 ` [igt-dev] [PATCH i-g-t 2/2] Add i915/gem_ctx_persistence Chris Wilson 2019-09-25 14:17 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] i915_drm.h sync Patchwork 2019-09-25 14:24 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2019-10-10 7:32 [igt-dev] [PATCH i-g-t 1/2] " Chris Wilson 2019-10-10 8:23 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox