Soon we will have tests that are only for platforms with reset-engine (GEN8+), so add a helper to query the has_gpu_reset via the getparam ioctl.
v2: Add more helper functions to avoid using magic numbers in tests (Arek). Cc: Arkadiusz Hiler <[email protected]> Signed-off-by: Michel Thierry <[email protected]> --- lib/ioctl_wrappers.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/ioctl_wrappers.h | 3 +++ 2 files changed, 54 insertions(+) diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 2bbaed54..51000bac 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -1193,6 +1193,57 @@ bool gem_uses_full_ppgtt(int fd) } /** + * gem_gpu_reset_type: + * @fd: open i915 drm file descriptor + * + * Query whether reset-engine (2), global-reset (1) or reset-disable (0) + * is available. + * + * Returns: GPU reset type available + */ +int gem_gpu_reset_type(int fd) +{ + struct drm_i915_getparam gp; + int gpu_reset_type = -1; + + memset(&gp, 0, sizeof(gp)); + gp.param = I915_PARAM_HAS_GPU_RESET; + gp.value = &gpu_reset_type; + drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + return gpu_reset_type; +} + +/** + * gem_gpu_reset_enabled: + * @fd: open i915 drm file descriptor + * + * Feature test macro to check whether the kernel internally uses hangchecks + * and can reset the GPU upon hang detection. Note that this is also true when + * reset-engine (the lightweight, single engine reset) is available. + * + * Returns: Whether the driver will detect hangs and perform a reset. + */ +bool gem_gpu_reset_enabled(int fd) +{ + return gem_gpu_reset_type(fd) > 0; +} + +/** + * gem_engine_reset_enabled: + * @fd: open i915 drm file descriptor + * + * Feature test macro to check whether the kernel internally uses hangchecks + * and can reset individual engines upon hang detection. + * + * Returns: Whether the driver will detect hangs and perform an engine reset. + */ +bool gem_engine_reset_enabled(int fd) +{ + return gem_gpu_reset_type(fd) > 1; +} + +/** * gem_available_fences: * @fd: open i915 drm file descriptor * diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index e1279d94..8915edca 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -166,6 +166,9 @@ bool gem_has_bsd2(int fd); int gem_gtt_type(int fd); bool gem_uses_ppgtt(int fd); bool gem_uses_full_ppgtt(int fd); +int gem_gpu_reset_type(int fd); +bool gem_gpu_reset_enabled(int fd); +bool gem_engine_reset_enabled(int fd); int gem_available_fences(int fd); uint64_t gem_total_mappable_size(int fd); uint64_t gem_total_stolen_size(int fd); -- 2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
