[igt-dev] [PATCH 5/7] tests/panfrost: Simplify submit tests
Boris Brezillon
boris.brezillon at collabora.com
Mon Jun 21 12:57:22 UTC 2021
Use NULL jobs and WRITE_VALUE job loops to test job submission. This
way we get tests that pass on both Midgard and Bifrost without pulling
the pan_pack() infrastructure from mesa. Note that we'll have to do that
at some point if we want to add complex tests, but we're not there yet.
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
---
tests/panfrost_submit.c | 88 +++++++++++++++++------------------------
1 file changed, 36 insertions(+), 52 deletions(-)
diff --git a/tests/panfrost_submit.c b/tests/panfrost_submit.c
index 13ce85b73d9e..aa2c277bbdb6 100644
--- a/tests/panfrost_submit.c
+++ b/tests/panfrost_submit.c
@@ -57,30 +57,9 @@ abs_timeout(uint64_t duration)
return (uint64_t)current.tv_sec * NSECS_PER_SEC + current.tv_nsec + duration;
}
-static void check_error(int fd, struct panfrost_submit *submit)
+static void check_done(struct mali_job_descriptor_header *header)
{
- struct mali_job_descriptor_header *header;
-
- header = submit->submit_bo->map;
- igt_assert_eq_u64(header->fault_pointer, 0);
-}
-
-static void check_fb(int fd, struct panfrost_bo *bo)
-{
- int gpu_prod_id = igt_panfrost_get_param(fd, DRM_PANFROST_PARAM_GPU_PROD_ID);
- __uint32_t *fbo;
- int i;
-
- fbo = bo->map;
-
- if (gpu_prod_id >= 0x0750) {
- for (i = 0; i < ALIGN(WIDTH, 16) * HEIGHT; i++)
- igt_assert_eq_u32(fbo[i], CLEAR_COLOR);
- } else {
- // Mask the alpha away because on <=T720 we don't know how to have it
- for (i = 0; i < ALIGN(WIDTH, 16) * HEIGHT; i++)
- igt_assert_eq_u32(fbo[i], CLEAR_COLOR & 0x00ffffff);
- }
+ igt_assert(header->exception_status == 1 && header->fault_pointer == 0);
}
igt_main
@@ -94,15 +73,12 @@ igt_main
igt_subtest("pan-submit") {
struct panfrost_submit *submit;
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
+ submit = igt_panfrost_null_job(fd);
- igt_panfrost_bo_mmap(fd, submit->fbo);
do_ioctl(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args);
igt_assert(syncobj_wait(fd, &submit->args->out_sync, 1,
abs_timeout(SHORT_TIME_NSEC), 0, NULL));
- check_error(fd, submit);
- check_fb(fd, submit->fbo);
+ check_done(submit->submit_bo->map);
igt_panfrost_free_job(fd, submit);
}
@@ -114,65 +90,73 @@ igt_main
igt_subtest("pan-submit-error-bad-in-syncs") {
struct panfrost_submit *submit;
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
+ submit = igt_panfrost_null_job(fd);
submit->args->in_syncs = 0ULL;
submit->args->in_sync_count = 1;
do_ioctl_err(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args, EFAULT);
+ igt_panfrost_free_job(fd, submit);
}
igt_subtest("pan-submit-error-bad-bo-handles") {
struct panfrost_submit *submit;
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
+ submit = igt_panfrost_null_job(fd);
submit->args->bo_handles = 0ULL;
submit->args->bo_handle_count = 1;
do_ioctl_err(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args, EFAULT);
+ igt_panfrost_free_job(fd, submit);
}
igt_subtest("pan-submit-error-bad-requirements") {
struct panfrost_submit *submit;
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
+ submit = igt_panfrost_null_job(fd);
submit->args->requirements = 2;
do_ioctl_err(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args, EINVAL);
+ igt_panfrost_free_job(fd, submit);
}
igt_subtest("pan-submit-error-bad-out-sync") {
struct panfrost_submit *submit;
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
+ submit = igt_panfrost_null_job(fd);
submit->args->out_sync = -1;
do_ioctl_err(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args, ENODEV);
+ igt_panfrost_free_job(fd, submit);
}
igt_subtest("pan-reset") {
- struct panfrost_submit *submit;
+ int tmpfd = drm_open_driver(DRIVER_PANFROST);
+ struct panfrost_submit *submit[2];
+ struct mali_job_descriptor_header *headers[3];
- submit = igt_panfrost_trivial_job(fd, true, WIDTH, HEIGHT,
- CLEAR_COLOR);
- do_ioctl(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args);
- /* Expect for this job to timeout */
- igt_assert(!syncobj_wait(fd, &submit->args->out_sync, 1,
+ submit[0] = igt_panfrost_job_loop(fd);
+ submit[1] = igt_panfrost_null_job(tmpfd);
+ headers[0] = submit[0]->submit_bo->map;
+ headers[1] = submit[0]->submit_bo->map +
+ ALIGN(sizeof(struct mali_job_descriptor_header) + sizeof(struct mali_payload_set_value),
+ 64);
+ headers[2] = submit[1]->submit_bo->map;
+ do_ioctl(fd, DRM_IOCTL_PANFROST_SUBMIT, submit[0]->args);
+ do_ioctl(tmpfd, DRM_IOCTL_PANFROST_SUBMIT, submit[1]->args);
+ /* First job should timeout, second job should complete right after the timeout */
+ igt_assert(!syncobj_wait(fd, &submit[0]->args->out_sync, 1,
abs_timeout(SHORT_TIME_NSEC), 0, NULL));
- igt_panfrost_free_job(fd, submit);
-
- submit = igt_panfrost_trivial_job(fd, false, WIDTH, HEIGHT,
- CLEAR_COLOR);
- igt_panfrost_bo_mmap(fd, submit->fbo);
- do_ioctl(fd, DRM_IOCTL_PANFROST_SUBMIT, submit->args);
- /* This one should work */
- igt_assert(syncobj_wait(fd, &submit->args->out_sync, 1,
+ igt_assert(syncobj_wait(fd, &submit[0]->args->out_sync, 1,
abs_timeout(BAD_JOB_TIME_NSEC), 0, NULL));
- check_fb(fd, submit->fbo);
- igt_panfrost_free_job(fd, submit);
+ igt_assert(syncobj_wait(tmpfd, &submit[1]->args->out_sync, 1,
+ abs_timeout(SHORT_TIME_NSEC), 0, NULL));
+
+ /* At least one job header of the job loop should have its exception status set to 0 */
+ igt_assert(headers[0]->exception_status != 1 || headers[1]->exception_status != 1);
+ check_done(headers[2]);
+ igt_panfrost_free_job(fd, submit[0]);
+ igt_panfrost_free_job(tmpfd, submit[1]);
+ close(tmpfd);
}
igt_fixture {
--
2.31.1
More information about the igt-dev
mailing list