Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3694C894C9 for ; Mon, 9 Aug 2021 10:53:13 +0000 (UTC) From: Bhanuprakash Modem Date: Mon, 9 Aug 2021 16:23:30 +0530 Message-Id: <20210809105330.325650-2-bhanuprakash.modem@intel.com> In-Reply-To: <20210806134145.24634-53-zbigniew.kempczynski@intel.com> References: <20210806134145.24634-53-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [igt-dev] [i-g-t v8 52/56] tests/kms_vblank: Adopt to use allocator List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: For newer gens kernel will reject relocations returning -EINVAL so we should just provide the allocator handle to inject the hang. V2: * Drop is_i915_device() check Signed-off-by: Bhanuprakash Modem Cc: Zbigniew KempczyƄski Cc: Petri Latvala Cc: Ashutosh Dixit --- tests/kms_vblank.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c index 885b2e2c4..f3a9875e3 100644 --- a/tests/kms_vblank.c +++ b/tests/kms_vblank.c @@ -118,6 +118,7 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_output_t *output = data->output; int fd = display->drm_fd; igt_hang_t hang; + uint64_t ahnd = 0; prepare_crtc(data, fd, output); @@ -128,8 +129,10 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_subtest_name(), kmstest_pipe_name(data->pipe), igt_output_name(output)); - if (!(data->flags & NOHANG)) - hang = igt_hang_ring(fd, I915_EXEC_DEFAULT); + if (!(data->flags & NOHANG)) { + ahnd = get_reloc_ahnd(fd, 0); + hang = igt_hang_ring_with_ahnd(fd, I915_EXEC_DEFAULT, ahnd); + } if (data->flags & BUSY) { union drm_wait_vblank vbl; @@ -166,6 +169,8 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int)) igt_info("\n%s on pipe %s, connector %s: PASSED\n\n", igt_subtest_name(), kmstest_pipe_name(data->pipe), igt_output_name(output)); + put_ahnd(ahnd); + /* cleanup what prepare_crtc() has done */ cleanup_crtc(data, fd, output); } -- 2.32.0