[i-g-t V2 1/2] lib/drmtest: Ensure the XE driver is idle before starting a test
Kamil Konieczny
kamil.konieczny at linux.intel.com
Thu Jul 25 15:57:34 UTC 2024
Hi Bhanuprakash,
On 2024-07-25 at 09:48:03 +0530, Bhanuprakash Modem wrote:
> Re-use the existing i915's exit handler to make sure that the
> XE driver is idle before starting the subtest.
>
> V2:
> - Add some delay after attempting the gt reset
> - Cover drm render device path too
>
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/294
> Cc: Matthew Brost <matthew.brost at intel.com>
> Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> Cc: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
+Cc Marcin
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Please remove my r-b after changes were done in v2.
> ---
> lib/drmtest.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index f8810da43..90885ec36 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -64,6 +64,7 @@
> #include "intel_reg.h"
> #include "ioctl_wrappers.h"
> #include "igt_dummyload.h"
> +#include "xe/xe_gt.h"
> #include "xe/xe_query.h"
>
> /**
> @@ -663,12 +664,17 @@ static void __cancel_work_at_exit(int fd)
> {
> igt_terminate_spins(); /* for older kernels */
>
> - igt_params_set(fd, "reset", "%u", -1u /* any method */);
> - igt_drop_caches_set(fd,
> - /* cancel everything */
> - DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
> - /* cleanup */
> - DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
> + if (is_xe_device(fd)) {
> + xe_force_gt_reset_all(fd);
> + sleep(1);
Please remove r-b and a-b tags when you make some changes to code.
imho we should discuss it more to see the problem and
think how to solve it.
Regards,
Kamil
> + } else {
> + igt_params_set(fd, "reset", "%u", -1u /* any method */);
> + igt_drop_caches_set(fd,
> + /* cancel everything */
> + DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
> + /* cleanup */
> + DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
> + }
> }
>
> static void cancel_work_at_exit(int sig)
> @@ -716,11 +722,11 @@ int drm_open_driver(int chipset)
> igt_skip_on_f(fd<0, "No known gpu found for chipset flags 0x%u (%s)\n",
> chipset, chipset_to_str(chipset));
>
> - /* For i915, at least, we ensure that the driver is idle before
> + /* For i915 & xe, at least, we ensure that the driver is idle before
> * starting a test and we install an exit handler to wait until
> * idle before quitting.
> */
> - if (is_i915_device(fd)) {
> + if (is_intel_device(fd)) {
> if (__sync_fetch_and_add(&open_count, 1) == 0) {
> __cancel_work_at_exit(fd);
> at_exit_drm_fd = drm_reopen_driver(fd);
> @@ -836,7 +842,7 @@ int drm_open_driver_render(int chipset)
> return fd;
>
> at_exit_drm_render_fd = drm_reopen_driver(fd);
> - if (chipset & DRIVER_INTEL) {
> + if (chipset & (DRIVER_INTEL | DRIVER_XE)) {
> __cancel_work_at_exit(fd);
> igt_install_exit_handler(cancel_work_at_exit_render);
> }
> --
> 2.43.2
>
More information about the igt-dev
mailing list