From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 27E81C5320E for ; Tue, 27 Aug 2024 06:14:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57ABA10E19D; Tue, 27 Aug 2024 06:14:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="OkvQ3gXW"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61C6710E133 for ; Tue, 27 Aug 2024 06:14:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724739279; x=1756275279; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Y17/L7+nCeyGsXHhipW58GIa4bYUowEQ7szhpdBBUV8=; b=OkvQ3gXWQXWOV24I43ijtzy0GxdeQhS5ToCuRM16bdFHnClDmqxlRkkl RZGFBc3MRB9cTTbNl6UE7jPizqGRr9QX/+pPaLQgysYGe6lnjyVq20vRT lqw/id4vTkQ71zCCF6k09xa+k1O8cwii3NrhQlgSjOLq6vwonydvLrSkG cam4q7zIacKrhoh4mSAkP5vAin0D/S2gg/nu51oiAaRYdPRaE7eCY5Dwl 0VmbrFEaKjUCeFLzy6Ry093R0V1w65FSP240p7/Fb1QaTfvqxYBZpgCIo dXK9GpQe2DoGWLaVKeeay8eOI7p3Y94DKFZx9YHw3biOYvZQ9NLGZdo6R Q==; X-CSE-ConnectionGUID: YA+wSE9YRLyrbmPAfPJBzA== X-CSE-MsgGUID: MZydLFH6TBmSbSUm4XctOw== X-IronPort-AV: E=McAfee;i="6700,10204,11176"; a="40699834" X-IronPort-AV: E=Sophos;i="6.10,179,1719903600"; d="scan'208";a="40699834" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2024 23:14:38 -0700 X-CSE-ConnectionGUID: QphSbugYR5KRkPQ9UX81bQ== X-CSE-MsgGUID: hfkyUssfTj21obNfwsUCbA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,179,1719903600"; d="scan'208";a="62452323" Received: from rgsanthosh-z690i-a-ultra-plus.iind.intel.com ([10.145.162.135]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2024 23:14:32 -0700 From: Santhosh Reddy Guddati To: igt-dev@lists.freedesktop.org Cc: karthik.b.s@intel.com, vandita.kulkarni@intel.com, Santhosh Reddy Guddati Subject: [PATCH i-g-t 1/2] tests/kms_async_flips: subtests to validate async flips on atomic path Date: Tue, 27 Aug 2024 11:41:09 +0530 Message-Id: <20240827061111.472460-1-santhosh.reddy.guddati@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Signed-off-by: Santhosh Reddy Guddati --- tests/kms_async_flips.c | 154 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 141 insertions(+), 13 deletions(-) diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c index 5b70c4033..21cf0d302 100644 --- a/tests/kms_async_flips.c +++ b/tests/kms_async_flips.c @@ -66,6 +66,25 @@ * * SUBTEST: invalid-async-flip * Description: Negative case to verify if changes in fb are rejected from kernel as expected + * + * SUBTEST: alternate-sync-async-flip-atomic + * Description: Verify the async flip functionality and the fps during async flips using atomic path + * + * SUBTEST: async-flip-with-page-flip-events-atomic + * Description: Wait for page flip events in between successive asynchronous flips using atomic path + * + * SUBTEST: test-time-stamp-atomic + * Description: Verify that the async flip timestamp does not coincide with either previous or next vblank + * when async flip is done using atomic path + * + * SUBTEST: test-cursor-atomic + * Description: Verify that the DRM_IOCTL_MODE_CURSOR passes after async flip with atomic commit + * + * SUBTEST: invalid-async-flip-atomic + * Description: Negative case to verify if changes in fb are rejected from kernel as expected when async flip is done using atomic path + * + * SUBTEST: crc-atomic + * Description: Use CRC to verify async flip scans out the correct framebuffer with atomic commit */ #define CURSOR_POS 128 @@ -101,6 +120,7 @@ typedef struct { bool alternate_sync_async; bool allow_fail; struct buf_ops *bops; + bool atomic_path; } data_t; static void flip_handler(int fd_, unsigned int sequence, unsigned int tv_sec, @@ -271,9 +291,14 @@ static void test_async_flip(data_t *data) if (data->alternate_sync_async) { flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; - ret = drmModePageFlip(data->drm_fd, data->crtc_id, + if (!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame % NUM_FBS].fb_id, flags, data); + } else { + igt_plane_set_fb(data->plane, &data->bufs[frame % NUM_FBS]); + ret = igt_display_try_commit_atomic(&data->display, flags, data); + } igt_assert_eq(ret, 0); @@ -282,19 +307,30 @@ static void test_async_flip(data_t *data) flags |= DRM_MODE_PAGE_FLIP_ASYNC; if (async_flip_needs_extra_frame(data)) { - ret = drmModePageFlip(data->drm_fd, data->crtc_id, + if (!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame % NUM_FBS].fb_id, flags, data); - + } else { + igt_plane_set_fb(data->plane, &data->bufs[frame % NUM_FBS]); + ret = igt_display_try_commit_atomic(&data->display, flags, data); + } igt_assert_eq(ret, 0); wait_flip_event(data); } } - ret = drmModePageFlip(data->drm_fd, data->crtc_id, + if (!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame % NUM_FBS].fb_id, flags, data); + } else { + igt_plane_set_fb(data->plane, &data->bufs[frame % NUM_FBS]); + ret = igt_display_try_commit_atomic(&data->display, flags, data); + igt_skip_on(ret == -EINVAL); + } + if (frame == 1 && data->allow_fail) igt_skip_on(ret == -EINVAL); else @@ -419,9 +455,14 @@ static void test_cursor(data_t *data) do_ioctl(data->drm_fd, DRM_IOCTL_MODE_CURSOR, &cur); - ret = drmModePageFlip(data->drm_fd, data->crtc_id, - data->bufs[0].fb_id, - flags, data); + if (!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, + data->bufs[0].fb_id, + flags, data); + } else { + igt_plane_set_fb(data->plane, &data->bufs[0]); + ret = igt_display_try_commit_atomic(&data->display, flags, data); + } igt_assert_eq(ret, 0); @@ -457,14 +498,24 @@ static void test_invalid(data_t *data) igt_display_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); /* first async flip is expected to allow modifier changes */ - ret = drmModePageFlip(data->drm_fd, data->crtc_id, fb[1].fb_id, - DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + if(!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, fb[1].fb_id, + DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + } else { + igt_plane_set_fb(data->plane, &fb[1]); + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_PAGE_FLIP_ASYNC, data); + } igt_assert_eq(ret, 0); wait_flip_event(data); /* subsequent async flips should reject modifier changes */ - ret = drmModePageFlip(data->drm_fd, data->crtc_id, fb[0].fb_id, - DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + if(!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, fb[0].fb_id, + DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + } else { + igt_plane_set_fb(data->plane, &fb[0]); + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_PAGE_FLIP_ASYNC, data); + } igt_assert(ret == -EINVAL); /* TODO: Add verification for changes in stride, pixel format */ @@ -611,8 +662,26 @@ static void test_crc(data_t *data) paint_fb(data, &data->bufs[frame], 1, height, 0xff0000ff); data->flip_pending = true; - ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame].fb_id, - DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + + if (!data->atomic_path) { + ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame].fb_id, + DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + } else { + // TODO: Check if the first frame modeset is required. + // Atomic commit is failing with invalid parameter when async flip with atomic is done + // for crc test. So, skipping the first frame modeset. + if (data->frame_count == 0) { + igt_plane_set_fb(data->plane, &data->bufs[frame]); + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET , data); + data->frame_count++; + continue; + } else { + igt_plane_set_fb(data->plane, &data->bufs[frame]); + ret = igt_display_try_commit_atomic(&data->display, + DRM_MODE_PAGE_FLIP_ASYNC | DRM_MODE_PAGE_FLIP_EVENT, data); + } + } + igt_assert_eq(ret, 0); wait_events_crc(data); @@ -705,15 +774,38 @@ igt_main run_test(&data, test_async_flip); } + igt_describe("Wait for page flip events in between successive asynchronous flips using atomic path"); + igt_subtest_with_dynamic("async-flip-with-page-flip-events-atomic") { + data.alternate_sync_async = false; + data.atomic_path = true; + if (is_intel_device(data.drm_fd)) + run_test_with_modifiers(&data, test_async_flip); + else + run_test(&data, test_async_flip); + } + igt_describe("Alternate between sync and async flips"); igt_subtest_with_dynamic("alternate-sync-async-flip") { data.alternate_sync_async = true; run_test(&data, test_async_flip); } + igt_describe("Alternate between sync and async flips using atomic path"); + igt_subtest_with_dynamic("alternate-sync-async-flip-atomic") { + data.alternate_sync_async = true; + data.atomic_path = true; + run_test(&data, test_async_flip); + } + igt_describe("Verify that the async flip timestamp does not coincide with either previous or next vblank"); igt_subtest_with_dynamic("test-time-stamp") run_test(&data, test_timestamp); + + igt_describe("Verify that the async flip timestamp does not coincide with either previous or next vblank with atomic path"); + igt_subtest_with_dynamic("test-time-stamp-atomic") { + data.atomic_path = true; + run_test(&data, test_timestamp); + } } igt_describe("Verify that the DRM_IOCTL_MODE_CURSOR passes after async flip"); @@ -730,6 +822,20 @@ igt_main run_test(&data, test_cursor); } + igt_describe("Verify that the DRM_IOCTL_MODE_CURSOR passes after async flip with atomic commit"); + igt_subtest_with_dynamic("test-cursor-atomic") { + /* + * Intel's PSR2 selective fetch adds other planes to state when + * necessary, causing the async flip to fail because async flip is not + * supported in cursor plane. + */ + igt_skip_on_f(i915_psr2_selective_fetch_check(data.drm_fd, NULL), + "PSR2 sel fetch causes cursor to be added to primary plane " \ + "pages flips and async flip is not supported in cursor\n"); + data.atomic_path = true; + run_test(&data, test_cursor); + } + igt_describe("Negative case to verify if changes in fb are rejected from kernel as expected"); igt_subtest_with_dynamic("invalid-async-flip") { /* TODO: support more vendors */ @@ -742,6 +848,19 @@ igt_main run_test(&data, test_invalid); } + igt_describe("Negative case to verify if changes in fb are rejected from kernel as expected when async flip is done using atomic path"); + igt_subtest_with_dynamic("invalid-async-flip-atomic") { + data.atomic_path = true; + /* TODO: support more vendors */ + igt_require(is_intel_device(data.drm_fd)); + igt_require(igt_display_has_format_mod(&data.display, DRM_FORMAT_XRGB8888, + I915_FORMAT_MOD_X_TILED)); + igt_require(igt_display_has_format_mod(&data.display, DRM_FORMAT_XRGB8888, + I915_FORMAT_MOD_Y_TILED)); + + run_test(&data, test_invalid); + } + igt_describe("Use CRC to verify async flip scans out the correct framebuffer"); igt_subtest_with_dynamic("crc") { /* Devices without CRC can't run this test */ @@ -750,6 +869,15 @@ igt_main run_test(&data, test_crc); } + igt_describe("Use CRC to verify async flip scans out the correct framebuffer with atomic commit"); + igt_subtest_with_dynamic("crc-atomic") { + /* Devices without CRC can't run this test */ + igt_require_pipe_crc(data.drm_fd); + + data.atomic_path = true; + run_test(&data, test_crc); + } + igt_fixture { for (i = 0; i < NUM_FBS; i++) igt_remove_fb(data.drm_fd, &data.bufs[i]); -- 2.34.1