From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57CE8CCA47E for ; Wed, 15 Jun 2022 13:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354401AbiFON7e (ORCPT ); Wed, 15 Jun 2022 09:59:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354395AbiFON7V (ORCPT ); Wed, 15 Jun 2022 09:59:21 -0400 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D4E3A18F for ; Wed, 15 Jun 2022 06:59:16 -0700 (PDT) Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-fe32122311so16583793fac.7 for ; Wed, 15 Jun 2022 06:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ke74yS+EUhUdYFIDDGGyv82yFVctd155+Aond1yGQCw=; b=N5LFMZFpO7uX11G1sXwNvE0J6DBksGSBP06VFoHZ599PmY+tOmRg671fbCjEqiZ7bk A1x0BfnVmhlOFm7YrkxQVpeZYs/Y29uetkd5OfTNJ6TT+8uwLpddUbHKhA/J3RDQv7QY NqmXsSLbmlddEYrreS2yghOibvN/YouuypKRRbVw0kGixOskGTTQdENMRA2HMb/zWDNa Nz3YKbkJJKmgCWElJD6t4LqmAFiV1qnc/vKKPPLgP43DLS/CRKlVvS4tIBPP5GKN0uF6 Ia1EwAfwzflJSOhSPCGLo5Y07oA3zjuZHc45R74p+AgFdUiMaA3PKqA66tjydogi2TbZ M/zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ke74yS+EUhUdYFIDDGGyv82yFVctd155+Aond1yGQCw=; b=7Bo9yuR2aSJ4n6ZKWURyS9bnnc/msPq3uoN6VtJH4lqyfTmlKZyYz7yHGEvRmKTRKJ qT5Pt+/19a4m2z/gev8pRGx4lIaD8/f3whbCc134eQ0qaYvNv6E3noB/oyKS8CAXrCGq MQTb9kROYLKx/UnPvBWCUlXafN1xWK5njbVbYbguwepnb8I0nd7IXf90JwIlPZGM8XgH crAc9SirDihH+gAzjhdKNBkeItfRCBHyhVMxvJMsftkwGIe+NIk1E7yqgiCHHReBUD9m +sX95CO9iUzu8rXK+i9enNkQkR19scBA08KQMGBx8ZUrUVm4Z8qO74sgXhoeQ7s3AHav lZOQ== X-Gm-Message-State: AJIora/rLI0SGCRABaBW3SPn3Ic+WUcKVa9Qnyg02o2cK/IwCnrIGZCw tz9jErH9ELCxa+2QzIeiYti/qA== X-Google-Smtp-Source: AGRyM1vTvZIP+h5CElfxgKVqwX8HAr9rVG8qq3gM9JeAfWjg6UEdfDLC6PczqteNYki17p8D4mDXhg== X-Received: by 2002:a05:6870:c1c1:b0:ee:5c83:7be7 with SMTP id i1-20020a056870c1c100b000ee5c837be7mr5332734oad.53.1655301555138; Wed, 15 Jun 2022 06:59:15 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:14 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= , Arthur Grillo Subject: [PATCH 01/10] drm: selftest: convert drm_damage_helper selftest to KUnit Date: Wed, 15 Jun 2022 10:58:15 -0300 Message-Id: <20220615135824.15522-2-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM damage helper selftest to the KUnit API. Co-developed-by: Arthur Grillo Signed-off-by: Arthur Grillo Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/selftests/Makefile | 3 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 21 - .../drm/selftests/test-drm_damage_helper.c | 667 ------------------ .../drm/selftests/test-drm_modeset_common.h | 21 - drivers/gpu/drm/tests/Kconfig | 28 + drivers/gpu/drm/tests/Makefile | 2 + .../gpu/drm/tests/test-drm_damage_helper.c | 633 +++++++++++++++++ 9 files changed, 667 insertions(+), 711 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c create mode 100644 drivers/gpu/drm/tests/Kconfig create mode 100644 drivers/gpu/drm/tests/Makefile create mode 100644 drivers/gpu/drm/tests/test-drm_damage_helper.c diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index e88c497fa010..bd1b5d82c9cf 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -70,6 +70,8 @@ config DRM_DEBUG_SELFTEST =20 If in doubt, say "N". =20 +source "drivers/gpu/drm/tests/Kconfig" + config DRM_KMS_HELPER tristate depends on DRM diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 15fe3163f822..0f24aa542be0 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -76,6 +76,7 @@ obj-$(CONFIG_DRM_KMS_HELPER) +=3D drm_kms_helper.o # =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D selftests/ +obj-y +=3D tests/ =20 obj-$(CONFIG_DRM_MIPI_DBI) +=3D drm_mipi_dbi.o obj-$(CONFIG_DRM_MIPI_DSI) +=3D drm_mipi_dsi.o diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 5ba5f9138c95..7a1a732e0a1b 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_plane_helper.o \ test-drm_format.o test-drm_framebuffer.o \ - test-drm_damage_helper.o test-drm_dp_mst_helper.o \ - test-drm_rect.o + test-drm_dp_mst_helper.o test-drm_rect.o =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o tes= t-drm_cmdline_parser.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h index 782e285ca383..4787b3b70709 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -15,26 +15,5 @@ selftest(check_drm_format_block_width, igt_check_drm_for= mat_block_width) selftest(check_drm_format_block_height, igt_check_drm_format_block_height) selftest(check_drm_format_min_pitch, igt_check_drm_format_min_pitch) selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) -selftest(damage_iter_no_damage, igt_damage_iter_no_damage) -selftest(damage_iter_no_damage_fractional_src, igt_damage_iter_no_damage_f= ractional_src) -selftest(damage_iter_no_damage_src_moved, igt_damage_iter_no_damage_src_mo= ved) -selftest(damage_iter_no_damage_fractional_src_moved, igt_damage_iter_no_da= mage_fractional_src_moved) -selftest(damage_iter_no_damage_not_visible, igt_damage_iter_no_damage_not_= visible) -selftest(damage_iter_no_damage_no_crtc, igt_damage_iter_no_damage_no_crtc) -selftest(damage_iter_no_damage_no_fb, igt_damage_iter_no_damage_no_fb) -selftest(damage_iter_simple_damage, igt_damage_iter_simple_damage) -selftest(damage_iter_single_damage, igt_damage_iter_single_damage) -selftest(damage_iter_single_damage_intersect_src, igt_damage_iter_single_d= amage_intersect_src) -selftest(damage_iter_single_damage_outside_src, igt_damage_iter_single_dam= age_outside_src) -selftest(damage_iter_single_damage_fractional_src, igt_damage_iter_single_= damage_fractional_src) -selftest(damage_iter_single_damage_intersect_fractional_src, igt_damage_it= er_single_damage_intersect_fractional_src) -selftest(damage_iter_single_damage_outside_fractional_src, igt_damage_iter= _single_damage_outside_fractional_src) -selftest(damage_iter_single_damage_src_moved, igt_damage_iter_single_damag= e_src_moved) -selftest(damage_iter_single_damage_fractional_src_moved, igt_damage_iter_s= ingle_damage_fractional_src_moved) -selftest(damage_iter_damage, igt_damage_iter_damage) -selftest(damage_iter_damage_one_intersect, igt_damage_iter_damage_one_inte= rsect) -selftest(damage_iter_damage_one_outside, igt_damage_iter_damage_one_outsid= e) -selftest(damage_iter_damage_src_moved, igt_damage_iter_damage_src_moved) -selftest(damage_iter_damage_not_visible, igt_damage_iter_damage_not_visibl= e) selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode) selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decod= e) diff --git a/drivers/gpu/drm/selftests/test-drm_damage_helper.c b/drivers/g= pu/drm/selftests/test-drm_damage_helper.c deleted file mode 100644 index 8d8d8e214c28..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_damage_helper.c +++ /dev/null @@ -1,667 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Test case for drm_damage_helper functions - */ - -#define pr_fmt(fmt) "drm_damage_helper: " fmt - -#include -#include -#include - -#include "test-drm_modeset_common.h" - -struct drm_driver mock_driver; -static struct drm_device mock_device; -static struct drm_object_properties mock_obj_props; -static struct drm_plane mock_plane; -static struct drm_property mock_prop; - -static void mock_setup(struct drm_plane_state *state) -{ - static bool setup_done =3D false; - - state->plane =3D &mock_plane; - - if (setup_done) - return; - - /* just enough so that drm_plane_enable_fb_damage_clips() works */ - mock_device.driver =3D &mock_driver; - mock_device.mode_config.prop_fb_damage_clips =3D &mock_prop; - mock_plane.dev =3D &mock_device; - mock_obj_props.count =3D 0; - mock_plane.base.properties =3D &mock_obj_props; - mock_prop.base.id =3D 1; /* 0 is an invalid id */ - mock_prop.dev =3D &mock_device; - - drm_plane_enable_fb_damage_clips(&mock_plane); -} - -static void set_plane_src(struct drm_plane_state *state, int x1, int y1, i= nt x2, - int y2) -{ - state->src.x1 =3D x1; - state->src.y1 =3D y1; - state->src.x2 =3D x2; - state->src.y2 =3D y2; -} - -static void set_damage_clip(struct drm_mode_rect *r, int x1, int y1, int x= 2, - int y2) -{ - r->x1 =3D x1; - r->y1 =3D y1; - r->x2 =3D x2; - r->y2 =3D y2; -} - -static void set_damage_blob(struct drm_property_blob *damage_blob, - struct drm_mode_rect *r, uint32_t size) -{ - damage_blob->length =3D size; - damage_blob->data =3D r; -} - -static void set_plane_damage(struct drm_plane_state *state, - struct drm_property_blob *damage_blob) -{ - state->fb_damage_clips =3D damage_blob; -} - -static bool check_damage_clip(struct drm_plane_state *state, struct drm_re= ct *r, - int x1, int y1, int x2, int y2) -{ - /* - * Round down x1/y1 and round up x2/y2. This is because damage is not in - * 16.16 fixed point so to catch all pixels. - */ - int src_x1 =3D state->src.x1 >> 16; - int src_y1 =3D state->src.y1 >> 16; - int src_x2 =3D (state->src.x2 >> 16) + !!(state->src.x2 & 0xFFFF); - int src_y2 =3D (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF); - - if (x1 >=3D x2 || y1 >=3D y2) { - pr_err("Cannot have damage clip with no dimension.\n"); - return false; - } - - if (x1 < src_x1 || y1 < src_y1 || x2 > src_x2 || y2 > src_y2) { - pr_err("Damage cannot be outside rounded plane src.\n"); - return false; - } - - if (r->x1 !=3D x1 || r->y1 !=3D y1 || r->x2 !=3D x2 || r->y2 !=3D y2) { - pr_err("Damage =3D %d %d %d %d\n", r->x1, r->y1, r->x2, r->y2); - return false; - } - - return true; -} - -const struct drm_framebuffer fb =3D { - .width =3D 2048, - .height =3D 2048 -}; - -/* common mocked structs many tests need */ -#define MOCK_VARIABLES() \ - struct drm_plane_state old_state; \ - struct drm_plane_state state =3D { \ - .crtc =3D ZERO_SIZE_PTR, \ - .fb =3D (struct drm_framebuffer *) &fb, \ - .visible =3D true, \ - }; \ - mock_setup(&old_state); \ - mock_setup(&state); - -int igt_damage_iter_no_damage(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src same as fb size. */ - set_plane_src(&old_state, 0, 0, fb.width << 16, fb.height << 16); - set_plane_src(&state, 0, 0, fb.width << 16, fb.height << 16); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 2048, 2048)); - - return 0; -} - -int igt_damage_iter_no_damage_fractional_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src has fractional part. */ - set_plane_src(&old_state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - set_plane_src(&state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return rounded off plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772)); - - return 0; -} - -int igt_damage_iter_no_damage_src_moved(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src moved since old plane state. */ - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 10 << 16, 10 << 16, - (10 + 1024) << 16, (10 + 768) << 16); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778)); - - return 0; -} - -int igt_damage_iter_no_damage_fractional_src_moved(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src has fractional part and it moved since old plane state. */ - set_plane_src(&old_state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773)); - - return 0; -} - -int igt_damage_iter_no_damage_not_visible(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - state.visible =3D false; - - mock_setup(&old_state); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should have no damage."); - - return 0; -} - -int igt_damage_iter_no_damage_no_crtc(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - state.crtc =3D NULL; - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should have no damage."); - - return 0; -} - -int igt_damage_iter_no_damage_no_fb(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_plane_state old_state; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - struct drm_plane_state state =3D { - .crtc =3D ZERO_SIZE_PTR, - .fb =3D 0, - }; - - mock_setup(&old_state); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should have no damage."); - - return 0; -} - -int igt_damage_iter_simple_damage(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - /* Damage set to plane src */ - set_damage_clip(&damage, 0, 0, 1024, 768); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage when set."); - FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 1024, 768)); - - return 0; -} - -int igt_damage_iter_single_damage(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - set_damage_clip(&damage, 256, 192, 768, 576); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage when set."); - FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 768, 576)); - - return 0; -} - -int igt_damage_iter_single_damage_intersect_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - /* Damage intersect with plane src. */ - set_damage_clip(&damage, 256, 192, 1360, 768); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage clipped to src."); - FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 1024, 768)); - - return 0; -} - -int igt_damage_iter_single_damage_outside_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - /* Damage clip outside plane src */ - set_damage_clip(&damage, 1360, 1360, 1380, 1380); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should have no damage."); - - return 0; -} - -int igt_damage_iter_single_damage_fractional_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src has fractional part. */ - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_damage_clip(&damage, 10, 10, 256, 330); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage when set."); - FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 256, 330)); - - return 0; -} - -int igt_damage_iter_single_damage_intersect_fractional_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src has fractional part. */ - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - /* Damage intersect with plane src. */ - set_damage_clip(&damage, 10, 1, 1360, 330); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage clipped to rounded off src."); - FAIL_ON(!check_damage_clip(&state, &clip, 10, 4, 1029, 330)); - - return 0; -} - -int igt_damage_iter_single_damage_outside_fractional_src(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src has fractional part. */ - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - /* Damage clip outside plane src */ - set_damage_clip(&damage, 1360, 1360, 1380, 1380); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should have no damage."); - - return 0; -} - -int igt_damage_iter_single_damage_src_moved(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src moved since old plane state. */ - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 10 << 16, 10 << 16, - (10 + 1024) << 16, (10 + 768) << 16); - set_damage_clip(&damage, 20, 30, 256, 256); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778)); - - return 0; -} - -int igt_damage_iter_single_damage_fractional_src_moved(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - /* Plane src with fractional part moved since old plane state. */ - set_plane_src(&old_state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - /* Damage intersect with plane src. */ - set_damage_clip(&damage, 20, 30, 1360, 256); - set_damage_blob(&damage_blob, &damage, sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return rounded off plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773)); - - return 0; -} - -int igt_damage_iter_damage(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage[2]; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - /* 2 damage clips. */ - set_damage_clip(&damage[0], 20, 30, 200, 180); - set_damage_clip(&damage[1], 240, 200, 280, 250); - set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) { - if (num_hits =3D=3D 0) - FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180)); - if (num_hits =3D=3D 1) - FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250)); - num_hits++; - } - - FAIL(num_hits !=3D 2, "Should return damage when set."); - - return 0; -} - -int igt_damage_iter_damage_one_intersect(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage[2]; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - /* 2 damage clips, one intersect plane src. */ - set_damage_clip(&damage[0], 20, 30, 200, 180); - set_damage_clip(&damage[1], 2, 2, 1360, 1360); - set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) { - if (num_hits =3D=3D 0) - FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180)); - if (num_hits =3D=3D 1) - FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773)); - num_hits++; - } - - FAIL(num_hits !=3D 2, "Should return damage when set."); - - return 0; -} - -int igt_damage_iter_damage_one_outside(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage[2]; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0, 0, 1024 << 16, 768 << 16); - set_plane_src(&state, 0, 0, 1024 << 16, 768 << 16); - /* 2 damage clips, one outside plane src. */ - set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); - set_damage_clip(&damage[1], 240, 200, 280, 250); - set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return damage when set."); - FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250)); - - return 0; -} - -int igt_damage_iter_damage_src_moved(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage[2]; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - /* 2 damage clips, one outside plane src. */ - set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); - set_damage_clip(&damage[1], 240, 200, 280, 250); - set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 1, "Should return round off plane src as damage."); - FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772)); - - return 0; -} - -int igt_damage_iter_damage_not_visible(void *ignored) -{ - struct drm_atomic_helper_damage_iter iter; - struct drm_property_blob damage_blob; - struct drm_mode_rect damage[2]; - struct drm_rect clip; - uint32_t num_hits =3D 0; - - MOCK_VARIABLES(); - - state.visible =3D false; - - set_plane_src(&old_state, 0x40002, 0x40002, - 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); - set_plane_src(&state, 0x3fffe, 0x3fffe, - 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); - /* 2 damage clips, one outside plane src. */ - set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); - set_damage_clip(&damage[1], 240, 200, 280, 250); - set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); - set_plane_damage(&state, &damage_blob); - drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); - drm_atomic_for_each_plane_damage(&iter, &clip) - num_hits++; - - FAIL(num_hits !=3D 0, "Should not return any damage."); - - return 0; -} diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h index cfb51d8da2bc..c29354e59cec 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -25,27 +25,6 @@ int igt_check_drm_format_block_width(void *ignored); int igt_check_drm_format_block_height(void *ignored); int igt_check_drm_format_min_pitch(void *ignored); int igt_check_drm_framebuffer_create(void *ignored); -int igt_damage_iter_no_damage(void *ignored); -int igt_damage_iter_no_damage_fractional_src(void *ignored); -int igt_damage_iter_no_damage_src_moved(void *ignored); -int igt_damage_iter_no_damage_fractional_src_moved(void *ignored); -int igt_damage_iter_no_damage_not_visible(void *ignored); -int igt_damage_iter_no_damage_no_crtc(void *ignored); -int igt_damage_iter_no_damage_no_fb(void *ignored); -int igt_damage_iter_simple_damage(void *ignored); -int igt_damage_iter_single_damage(void *ignored); -int igt_damage_iter_single_damage_intersect_src(void *ignored); -int igt_damage_iter_single_damage_outside_src(void *ignored); -int igt_damage_iter_single_damage_fractional_src(void *ignored); -int igt_damage_iter_single_damage_intersect_fractional_src(void *ignored); -int igt_damage_iter_single_damage_outside_fractional_src(void *ignored); -int igt_damage_iter_single_damage_src_moved(void *ignored); -int igt_damage_iter_single_damage_fractional_src_moved(void *ignored); -int igt_damage_iter_damage(void *ignored); -int igt_damage_iter_damage_one_intersect(void *ignored); -int igt_damage_iter_damage_one_outside(void *ignored); -int igt_damage_iter_damage_src_moved(void *ignored); -int igt_damage_iter_damage_not_visible(void *ignored); int igt_dp_mst_calc_pbn_mode(void *ignored); int igt_dp_mst_sideband_msg_req_decode(void *ignored); =20 diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig new file mode 100644 index 000000000000..686e134b88bf --- /dev/null +++ b/drivers/gpu/drm/tests/Kconfig @@ -0,0 +1,28 @@ +menu "KUnit tests for DRM" + depends on DRM && KUNIT + +config DRM_KUNIT_TEST + tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS + select DRM_KMS_HELPER + default KUNIT_ALL_TESTS + help + This option provides a KUnit module that can be used to run + all unit tests on the DRM API. This option is not useful for + distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + +config DRM_DAMAGE_HELPER_KUNIT_TEST + tristate "KUnit tests for DRM damage helper" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides a KUnit module that can be used to run + an unit test on the DRM damage helper API. This option is not + useful for distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + +endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile new file mode 100644 index 000000000000..3fef656dffb9 --- /dev/null +++ b/drivers/gpu/drm/tests/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) +=3D test-drm_damage_helper.o diff --git a/drivers/gpu/drm/tests/test-drm_damage_helper.c b/drivers/gpu/d= rm/tests/test-drm_damage_helper.c new file mode 100644 index 000000000000..5e170eb8753a --- /dev/null +++ b/drivers/gpu/drm/tests/test-drm_damage_helper.c @@ -0,0 +1,633 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Test case for drm_damage_helper functions + */ + +#include +#include +#include +#include + +struct drm_damage_mock { + struct drm_driver driver; + struct drm_device device; + struct drm_object_properties obj_props; + struct drm_plane plane; + struct drm_property prop; + struct drm_framebuffer fb; + struct drm_plane_state state; + struct drm_plane_state old_state; +}; + +static int drm_damage_helper_init(struct kunit *test) +{ + struct drm_damage_mock *mock; + + mock =3D kunit_kzalloc(test, sizeof(*mock), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mock); + + mock->fb.width =3D 2048; + mock->fb.height =3D 2048; + + mock->state.crtc =3D ZERO_SIZE_PTR; + mock->state.fb =3D &mock->fb; + mock->state.visible =3D true; + + mock->old_state.plane =3D &mock->plane; + mock->state.plane =3D &mock->plane; + + /* just enough so that drm_plane_enable_fb_damage_clips() works */ + mock->device.driver =3D &mock->driver; + mock->device.mode_config.prop_fb_damage_clips =3D &mock->prop; + mock->plane.dev =3D &mock->device; + mock->obj_props.count =3D 0; + mock->plane.base.properties =3D &mock->obj_props; + mock->prop.base.id =3D 1; /* 0 is an invalid id */ + mock->prop.dev =3D &mock->device; + + drm_plane_enable_fb_damage_clips(&mock->plane); + + test->priv =3D mock; + + return 0; +} + +static void set_plane_src(struct drm_plane_state *state, int x1, int y1, i= nt x2, + int y2) +{ + state->src.x1 =3D x1; + state->src.y1 =3D y1; + state->src.x2 =3D x2; + state->src.y2 =3D y2; +} + +static void set_damage_clip(struct drm_mode_rect *r, int x1, int y1, int x= 2, + int y2) +{ + r->x1 =3D x1; + r->y1 =3D y1; + r->x2 =3D x2; + r->y2 =3D y2; +} + +static void set_damage_blob(struct drm_property_blob *damage_blob, + struct drm_mode_rect *r, uint32_t size) +{ + damage_blob->length =3D size; + damage_blob->data =3D r; +} + +static void set_plane_damage(struct drm_plane_state *state, + struct drm_property_blob *damage_blob) +{ + state->fb_damage_clips =3D damage_blob; +} + +static void check_damage_clip(struct kunit *test, struct drm_rect *r, + int x1, int y1, int x2, int y2) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_plane_state state =3D mock->state; + + /* + * Round down x1/y1 and round up x2/y2. This is because damage is not in + * 16.16 fixed point so to catch all pixels. + */ + int src_x1 =3D state.src.x1 >> 16; + int src_y1 =3D state.src.y1 >> 16; + int src_x2 =3D (state.src.x2 >> 16) + !!(state.src.x2 & 0xFFFF); + int src_y2 =3D (state.src.y2 >> 16) + !!(state.src.y2 & 0xFFFF); + + if (x1 >=3D x2 || y1 >=3D y2) + KUNIT_FAIL(test, "Cannot have damage clip with no dimension."); + if (x1 < src_x1 || y1 < src_y1 || x2 > src_x2 || y2 > src_y2) + KUNIT_FAIL(test, "Damage cannot be outside rounded plane src."); + if (r->x1 !=3D x1 || r->y1 !=3D y1 || r->x2 !=3D x2 || r->y2 !=3D y2) + KUNIT_FAIL(test, "Damage =3D %d %d %d %d, want =3D %d %d %d %d", + r->x1, r->y1, r->x2, r->y2, x1, y1, x2, y2); +} + +static void igt_damage_iter_no_damage(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src same as fb size. */ + set_plane_src(&mock->old_state, 0, 0, mock->fb.width << 16, mock->fb.heig= ht << 16); + set_plane_src(&mock->state, 0, 0, mock->fb.width << 16, mock->fb.height <= < 16); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return plane src as damage= ."); + check_damage_clip(test, &clip, 0, 0, 2048, 2048); +} + +static void igt_damage_iter_no_damage_fractional_src(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src has fractional part. */ + set_plane_src(&mock->old_state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + set_plane_src(&mock->state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, + "Should return rounded off plane src as damage."); + check_damage_clip(test, &clip, 3, 3, 1028, 772); +} + +static void igt_damage_iter_no_damage_src_moved(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src moved since old plane state. */ + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 10 << 16, 10 << 16, + (10 + 1024) << 16, (10 + 768) << 16); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return plane src as damage= ."); + check_damage_clip(test, &clip, 10, 10, 1034, 778); +} + +static void igt_damage_iter_no_damage_fractional_src_moved(struct kunit *t= est) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src has fractional part and it moved since old plane state. */ + set_plane_src(&mock->old_state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return plane src as damage= ."); + check_damage_clip(test, &clip, 4, 4, 1029, 773); +} + +static void igt_damage_iter_no_damage_not_visible(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + mock->state.visible =3D false; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should have no damage."); +} + +static void igt_damage_iter_no_damage_no_crtc(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + mock->state.crtc =3D NULL; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should have no damage."); +} + +static void igt_damage_iter_no_damage_no_fb(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + mock->state.fb =3D NULL; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should have no damage."); +} + +static void igt_damage_iter_simple_damage(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + /* Damage set to plane src */ + set_damage_clip(&damage, 0, 0, 1024, 768); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return damage when set."); + check_damage_clip(test, &clip, 0, 0, 1024, 768); +} + +static void igt_damage_iter_single_damage(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + set_damage_clip(&damage, 256, 192, 768, 576); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return damage when set."); + check_damage_clip(test, &clip, 256, 192, 768, 576); +} + +static void igt_damage_iter_single_damage_intersect_src(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + /* Damage intersect with plane src. */ + set_damage_clip(&damage, 256, 192, 1360, 768); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return damage clipped to s= rc."); + check_damage_clip(test, &clip, 256, 192, 1024, 768); +} + +static void igt_damage_iter_single_damage_outside_src(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + /* Damage clip outside plane src */ + set_damage_clip(&damage, 1360, 1360, 1380, 1380); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should have no damage."); +} + +static void igt_damage_iter_single_damage_fractional_src(struct kunit *tes= t) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src has fractional part. */ + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_damage_clip(&damage, 10, 10, 256, 330); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return damage when set."); + check_damage_clip(test, &clip, 10, 10, 256, 330); +} + +static void igt_damage_iter_single_damage_intersect_fractional_src( + struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src has fractional part. */ + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + /* Damage intersect with plane src. */ + set_damage_clip(&damage, 10, 1, 1360, 330); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, + "Should return damage clipped to rounded off src."); + check_damage_clip(test, &clip, 10, 4, 1029, 330); +} + +static void igt_damage_iter_single_damage_outside_fractional_src( + struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src has fractional part. */ + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + /* Damage clip outside plane src */ + set_damage_clip(&damage, 1360, 1360, 1380, 1380); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should have no damage."); +} + +static void igt_damage_iter_single_damage_src_moved(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src moved since old plane state. */ + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 10 << 16, 10 << 16, + (10 + 1024) << 16, (10 + 768) << 16); + set_damage_clip(&damage, 20, 30, 256, 256); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, + "Should return plane src as damage."); + check_damage_clip(test, &clip, 10, 10, 1034, 778); +} + +static void igt_damage_iter_single_damage_fractional_src_moved( + struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + /* Plane src with fractional part moved since old plane state. */ + set_plane_src(&mock->old_state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + /* Damage intersect with plane src. */ + set_damage_clip(&damage, 20, 30, 1360, 256); + set_damage_blob(&damage_blob, &damage, sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, + "Should return rounded off plane as damage."); + check_damage_clip(test, &clip, 4, 4, 1029, 773); +} + +static void igt_damage_iter_damage(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage[2]; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + /* 2 damage clips. */ + set_damage_clip(&damage[0], 20, 30, 200, 180); + set_damage_clip(&damage[1], 240, 200, 280, 250); + set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) { + if (num_hits =3D=3D 0) + check_damage_clip(test, &clip, 20, 30, 200, 180); + if (num_hits =3D=3D 1) + check_damage_clip(test, &clip, 240, 200, 280, 250); + num_hits++; + } + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 2, "Should return damage when set."); +} + +static void igt_damage_iter_damage_one_intersect(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage[2]; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + /* 2 damage clips, one intersect plane src. */ + set_damage_clip(&damage[0], 20, 30, 200, 180); + set_damage_clip(&damage[1], 2, 2, 1360, 1360); + set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) { + if (num_hits =3D=3D 0) + check_damage_clip(test, &clip, 20, 30, 200, 180); + if (num_hits =3D=3D 1) + check_damage_clip(test, &clip, 4, 4, 1029, 773); + num_hits++; + } + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 2, "Should return damage when set."); +} + +static void igt_damage_iter_damage_one_outside(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage[2]; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0, 0, 1024 << 16, 768 << 16); + set_plane_src(&mock->state, 0, 0, 1024 << 16, 768 << 16); + /* 2 damage clips, one outside plane src. */ + set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); + set_damage_clip(&damage[1], 240, 200, 280, 250); + set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return damage when set."); + check_damage_clip(test, &clip, 240, 200, 280, 250); +} + +static void igt_damage_iter_damage_src_moved(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage[2]; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + /* 2 damage clips, one outside plane src. */ + set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); + set_damage_clip(&damage[1], 240, 200, 280, 250); + set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, + "Should return round off plane src as damage."); + check_damage_clip(test, &clip, 3, 3, 1028, 772); +} + +static void igt_damage_iter_damage_not_visible(struct kunit *test) +{ + struct drm_damage_mock *mock =3D test->priv; + struct drm_atomic_helper_damage_iter iter; + struct drm_property_blob damage_blob; + struct drm_mode_rect damage[2]; + struct drm_rect clip; + uint32_t num_hits =3D 0; + + mock->state.visible =3D false; + + set_plane_src(&mock->old_state, 0x40002, 0x40002, + 0x40002 + (1024 << 16), 0x40002 + (768 << 16)); + set_plane_src(&mock->state, 0x3fffe, 0x3fffe, + 0x3fffe + (1024 << 16), 0x3fffe + (768 << 16)); + /* 2 damage clips, one outside plane src. */ + set_damage_clip(&damage[0], 1360, 1360, 1380, 1380); + set_damage_clip(&damage[1], 240, 200, 280, 250); + set_damage_blob(&damage_blob, &damage[0], sizeof(damage)); + set_plane_damage(&mock->state, &damage_blob); + drm_atomic_helper_damage_iter_init(&iter, &mock->old_state, &mock->state); + drm_atomic_for_each_plane_damage(&iter, &clip) + num_hits++; + + KUNIT_EXPECT_EQ_MSG(test, num_hits, 0, "Should not return any damage."); +} + +static struct kunit_case drm_damage_helper_tests[] =3D { + KUNIT_CASE(igt_damage_iter_no_damage), + KUNIT_CASE(igt_damage_iter_no_damage_fractional_src), + KUNIT_CASE(igt_damage_iter_no_damage_src_moved), + KUNIT_CASE(igt_damage_iter_no_damage_fractional_src_moved), + KUNIT_CASE(igt_damage_iter_no_damage_not_visible), + KUNIT_CASE(igt_damage_iter_no_damage_no_crtc), + KUNIT_CASE(igt_damage_iter_no_damage_no_fb), + KUNIT_CASE(igt_damage_iter_simple_damage), + KUNIT_CASE(igt_damage_iter_single_damage), + KUNIT_CASE(igt_damage_iter_single_damage_intersect_src), + KUNIT_CASE(igt_damage_iter_single_damage_outside_src), + KUNIT_CASE(igt_damage_iter_single_damage_fractional_src), + KUNIT_CASE(igt_damage_iter_single_damage_intersect_fractional_src), + KUNIT_CASE(igt_damage_iter_single_damage_outside_fractional_src), + KUNIT_CASE(igt_damage_iter_single_damage_src_moved), + KUNIT_CASE(igt_damage_iter_single_damage_fractional_src_moved), + KUNIT_CASE(igt_damage_iter_damage), + KUNIT_CASE(igt_damage_iter_damage_one_intersect), + KUNIT_CASE(igt_damage_iter_damage_one_outside), + KUNIT_CASE(igt_damage_iter_damage_src_moved), + KUNIT_CASE(igt_damage_iter_damage_not_visible), + { } +}; + +static struct kunit_suite drm_damage_helper_test_suite =3D { + .name =3D "drm_damage_helper_tests", + .init =3D drm_damage_helper_init, + .test_cases =3D drm_damage_helper_tests, +}; + +kunit_test_suite(drm_damage_helper_test_suite); + +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D254CCCA473 for ; Wed, 15 Jun 2022 13:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355233AbiFON7h (ORCPT ); Wed, 15 Jun 2022 09:59:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353854AbiFON7a (ORCPT ); Wed, 15 Jun 2022 09:59:30 -0400 Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32D853B56A for ; Wed, 15 Jun 2022 06:59:22 -0700 (PDT) Received: by mail-oi1-x229.google.com with SMTP id v4so4970943oiv.1 for ; Wed, 15 Jun 2022 06:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jHVTFEOci2eUcOzV7CwWvOhg3Cpxw3vHk3+96vsZXxo=; b=IR7FwiFA1rCw871OC2hQHeFDOFH01zdqRCRX3/RXa/OKvIg4x2mw4Ibon8PTcTfAKe dgYoswkLEP3FO9yusY0L51q3BEOnFQOtfGdt3OVVyicolH79ulaghXq6W6V8HMHOgnHw 3YSj+fNUdA04j8avJadPhF9/j9D5GP8k/p9XS907YgA5j6VtXFkkoW9eyIy6v3+1CYN0 dl2QYqw+5BFXT5T/+xgEkB7v98NJcI7cbGcVFuyuxAR07eixvexLjtF9rOL9nLVBM4dm 9Hq5UKt85GaZs3Hd6FGTkdc34XuQZuqv8SLmxprHBWiA6hIwh66vciBlz1SCyCdK8oEg OETQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jHVTFEOci2eUcOzV7CwWvOhg3Cpxw3vHk3+96vsZXxo=; b=veUMpSqC1ZpmecgUCs+RJXToczOQHaIELkgezVYI2wH9FYyM9da5zQAjbaEPRITJ2s iUUsAObT3Ik76iuvuV2+z2kjSt5vmfJwdte/qjD4a/EkK/YTxv88ebPu0myIAJPQ0zpS HTqhVlDjjkEML4QTmbiPWQ/WsO8EUz7q+6SsJYLq9AnWWYlfQ09P5c/TPlaFlEapTpgB dTMJq9b3gEOdKyzCeXTVouiQOWBLGxdaVj408jFNjBOlTcyRqzu7P9X9ZQ7oyRu2WW3S lEP43Jx0g1Crc7W30Lq85knXKetkp45J+GGAWeXfCVpvtHBNKAyyb2SuAN9SJ7Xqqlb7 F6Sg== X-Gm-Message-State: AOAM531Mad+iISgQkJwggfMBV42n9TxPWMBucJj3uryO0I9yyqI/vSLQ u/qYG9MIeuXWIE7WQfjg9cVBZw== X-Google-Smtp-Source: ABdhPJzG33LzogZqsHGVkIrQH0d7tkBu5KbKN7A7zkS3u0ftNovgDjRpli1apWqpuOySL+69snuxtA== X-Received: by 2002:aca:da85:0:b0:32e:b063:2451 with SMTP id r127-20020acada85000000b0032eb0632451mr4637363oig.159.1655301561367; Wed, 15 Jun 2022 06:59:21 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:20 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, Arthur Grillo , =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH 02/10] drm: selftest: refactor drm_cmdline_parser Date: Wed, 15 Jun 2022 10:58:16 -0300 Message-Id: <20220615135824.15522-3-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arthur Grillo Refactor the tests by modularizing the functions to avoid code repetition. Co-developed-by: Ma=C3=ADra Canal Signed-off-by: Arthur Grillo Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- .../drm/selftests/test-drm_cmdline_parser.c | 579 +++++------------- 1 file changed, 156 insertions(+), 423 deletions(-) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/= gpu/drm/selftests/test-drm_cmdline_parser.c index d96cd890def6..57a229c5fc35 100644 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2019 Bootlin + * Copyright (c) 2021 Ma=EF=BF=BDra Canal , + * Copyright (c) 2021 Arthur Grillo */ =20 #define pr_fmt(fmt) "drm_cmdline: " fmt @@ -17,13 +19,25 @@ =20 static const struct drm_connector no_connector =3D {}; =20 -static int drm_cmdline_test_force_e_only(void *ignored) +static int drm_cmdline_test_properties(void *ignored, + struct drm_cmdline_mode *mode, enum drm_connector_force force) +{ + FAIL_ON(mode->rb); + FAIL_ON(mode->cvt); + FAIL_ON(mode->interlace); + FAIL_ON(mode->margins); + FAIL_ON(mode->force !=3D force); + + return 0; +} + +static int drm_cmdline_test_force_only(void *ignored, char *cmdline, + const struct drm_connector *connector, enum drm_connector_force force) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("e", - &no_connector, - &mode)); + FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, + connector, &mode)); FAIL_ON(mode.specified); FAIL_ON(mode.refresh_specified); FAIL_ON(mode.bpp_specified); @@ -32,95 +46,101 @@ static int drm_cmdline_test_force_e_only(void *ignored) FAIL_ON(mode.cvt); FAIL_ON(mode.interlace); FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + FAIL_ON(mode.force !=3D force); =20 return 0; } =20 -static int drm_cmdline_test_force_D_only_not_digital(void *ignored) +static int drm_cmdline_test_freestanding(void *ignored, + struct drm_cmdline_mode *mode, char *cmdline, + const struct drm_connector *connector) { - struct drm_cmdline_mode mode =3D { }; + FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, + connector, mode)); + FAIL_ON(mode->specified); + FAIL_ON(mode->refresh_specified); + FAIL_ON(mode->bpp_specified); =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("D", - &no_connector, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); + FAIL_ON(mode->tv_margins.right !=3D 14); + FAIL_ON(mode->tv_margins.left !=3D 24); + FAIL_ON(mode->tv_margins.bottom !=3D 36); + FAIL_ON(mode->tv_margins.top !=3D 42); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + return 0; +} + +static int drm_cmdline_test_res_init(void *ignored, + struct drm_cmdline_mode *mode, char *cmdline) +{ + FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, + &no_connector, mode)); + FAIL_ON(!mode->specified); + FAIL_ON(mode->xres !=3D 720); + FAIL_ON(mode->yres !=3D 480); + + return 0; +} + +static int drm_cmdline_test_res_bpp_init(void *ignored, + struct drm_cmdline_mode *mode, char *cmdline) +{ + FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, + &no_connector, mode)); + FAIL_ON(!mode->specified); + FAIL_ON(mode->xres !=3D 720); + FAIL_ON(mode->yres !=3D 480); + + FAIL_ON(!mode->refresh_specified); + FAIL_ON(mode->refresh !=3D 60); + FAIL_ON(!mode->bpp_specified); + FAIL_ON(mode->bpp !=3D 24); + + return 0; +} + +static int drm_cmdline_test_force_e_only(void *ignored) +{ + drm_cmdline_test_force_only(ignored, "e", &no_connector, DRM_FORCE_ON); + + return 0; +} + +static int drm_cmdline_test_force_D_only_not_digital(void *ignored) +{ + drm_cmdline_test_force_only(ignored, "D", &no_connector, DRM_FORCE_ON); =20 return 0; } =20 static const struct drm_connector connector_hdmi =3D { .connector_type =3D DRM_MODE_CONNECTOR_HDMIB, + }; =20 static int drm_cmdline_test_force_D_only_hdmi(void *ignored) { - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("D", - &connector_hdmi, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON_DIGITAL); + drm_cmdline_test_force_only(ignored, "D", &connector_hdmi, + DRM_FORCE_ON_DIGITAL); =20 return 0; } =20 static const struct drm_connector connector_dvi =3D { .connector_type =3D DRM_MODE_CONNECTOR_DVII, + }; =20 static int drm_cmdline_test_force_D_only_dvi(void *ignored) { - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("D", - &connector_dvi, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON_DIGITAL); + drm_cmdline_test_force_only(ignored, "D", &connector_dvi, + DRM_FORCE_ON_DIGITAL); =20 return 0; } =20 static int drm_cmdline_test_force_d_only(void *ignored) { - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("d", - &no_connector, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_OFF); + drm_cmdline_test_force_only(ignored, "d", &no_connector, DRM_FORCE_OFF); =20 return 0; } @@ -151,15 +171,9 @@ static int drm_cmdline_test_res(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(mode.rb); @@ -219,15 +233,9 @@ static int drm_cmdline_test_res_vesa(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480M", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480M"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(mode.rb); @@ -243,15 +251,9 @@ static int drm_cmdline_test_res_vesa_rblank(void *igno= red) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480MR", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480MR"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(!mode.rb); @@ -267,15 +269,9 @@ static int drm_cmdline_test_res_rblank(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480R", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480R"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(!mode.rb); @@ -291,23 +287,13 @@ static int drm_cmdline_test_res_bpp(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480-24"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); FAIL_ON(mode.bpp !=3D 24); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -327,23 +313,13 @@ static int drm_cmdline_test_res_refresh(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480@60", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480@60"); =20 FAIL_ON(!mode.refresh_specified); FAIL_ON(mode.refresh !=3D 60); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -363,24 +339,8 @@ static int drm_cmdline_test_res_bpp_refresh(void *igno= red) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60"); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -389,18 +349,7 @@ static int drm_cmdline_test_res_bpp_refresh_interlaced= (void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60i", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60i"); =20 FAIL_ON(mode.rb); FAIL_ON(mode.cvt); @@ -415,18 +364,7 @@ static int drm_cmdline_test_res_bpp_refresh_margins(vo= id *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60m", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60m"); =20 FAIL_ON(mode.rb); FAIL_ON(mode.cvt); @@ -441,24 +379,8 @@ static int drm_cmdline_test_res_bpp_refresh_force_off(= void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60d", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_OFF); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60d"); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_OFF); =20 return 0; } @@ -478,24 +400,8 @@ static int drm_cmdline_test_res_bpp_refresh_force_on(v= oid *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60e", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60e"); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); =20 return 0; } @@ -504,24 +410,8 @@ static int drm_cmdline_test_res_bpp_refresh_force_on_a= nalog(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60D", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60D"); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); =20 return 0; } @@ -534,8 +424,7 @@ static int drm_cmdline_test_res_bpp_refresh_force_on_di= gital(void *ignored) }; =20 FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60D", - &connector, - &mode)); + &connector, &mode)); FAIL_ON(!mode.specified); FAIL_ON(mode.xres !=3D 720); FAIL_ON(mode.yres !=3D 480); @@ -546,11 +435,7 @@ static int drm_cmdline_test_res_bpp_refresh_force_on_d= igital(void *ignored) FAIL_ON(!mode.bpp_specified); FAIL_ON(mode.bpp !=3D 24); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON_DIGITAL); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON_DIGITAL); =20 return 0; } @@ -559,18 +444,7 @@ static int drm_cmdline_test_res_bpp_refresh_interlaced= _margins_force_on(void *ig { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60ime", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); + drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60ime"); =20 FAIL_ON(mode.rb); FAIL_ON(mode.cvt); @@ -585,15 +459,9 @@ static int drm_cmdline_test_res_margins_force_on(void = *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480me", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480me"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(mode.rb); @@ -609,15 +477,9 @@ static int drm_cmdline_test_res_vesa_margins(void *ign= ored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480Mm", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, "720x480Mm"); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 FAIL_ON(mode.rb); @@ -673,10 +535,9 @@ static int drm_cmdline_test_name_bpp(void *ignored) &no_connector, &mode)); FAIL_ON(strcmp(mode.name, "NTSC")); - FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); + FAIL_ON(mode.bpp !=3D 24); =20 return 0; @@ -760,23 +621,13 @@ static int drm_cmdline_test_rotate_0(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,rotate=3D0", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_0); + drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D0"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_0); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -785,23 +636,13 @@ static int drm_cmdline_test_rotate_90(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,rotate=3D90", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_90); + drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D90"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_90); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -810,23 +651,13 @@ static int drm_cmdline_test_rotate_180(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,rotate=3D180", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); + drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D180"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -835,23 +666,13 @@ static int drm_cmdline_test_rotate_270(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,rotate=3D270", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_270); + drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D270"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_270); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -860,9 +681,8 @@ static int drm_cmdline_test_rotate_multiple(void *ignor= ed) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480,rotate=3D0,rot= ate=3D90", - &no_connector, - &mode)); + FAIL_ON(drm_mode_parse_command_line_for_connector( + "720x480,rotate=3D0,rotate=3D90", &no_connector, &mode)); =20 return 0; } @@ -871,9 +691,8 @@ static int drm_cmdline_test_rotate_invalid_val(void *ig= nored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480,rotate=3D42", - &no_connector, - &mode)); + FAIL_ON(drm_mode_parse_command_line_for_connector( + "720x480,rotate=3D42", &no_connector, &mode)); =20 return 0; } @@ -882,9 +701,8 @@ static int drm_cmdline_test_rotate_truncated(void *igno= red) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480,rotate=3D", - &no_connector, - &mode)); + FAIL_ON(drm_mode_parse_command_line_for_connector( + "720x480,rotate=3D", &no_connector, &mode)); =20 return 0; } @@ -893,23 +711,13 @@ static int drm_cmdline_test_hmirror(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,reflect_x", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_X)); + drm_cmdline_test_res_init(ignored, &mode, "720x480,reflect_x"); =20 + FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_X)); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -918,23 +726,13 @@ static int drm_cmdline_test_vmirror(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,reflect_y", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_Y)); + drm_cmdline_test_res_init(ignored, &mode, "720x480,reflect_y"); =20 + FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_Y)); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -943,26 +741,18 @@ static int drm_cmdline_test_margin_options(void *igno= red) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,margin_right= =3D14,margin_left=3D24,margin_bottom=3D36,margin_top=3D42", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); + drm_cmdline_test_res_init(ignored, &mode, + "720x480,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_t= op=3D42"); + FAIL_ON(mode.tv_margins.right !=3D 14); FAIL_ON(mode.tv_margins.left !=3D 24); FAIL_ON(mode.tv_margins.bottom !=3D 36); FAIL_ON(mode.tv_margins.top !=3D 42); =20 FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -971,23 +761,13 @@ static int drm_cmdline_test_multiple_options(void *ig= nored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480,rotate=3D270,= reflect_x", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_270 | DRM_MODE_REF= LECT_X)); + drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D270,reflect_x= "); =20 + FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_270 | DRM_MODE_REF= LECT_X)); FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -996,9 +776,8 @@ static int drm_cmdline_test_invalid_option(void *ignore= d) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480,test=3D42", - &no_connector, - &mode)); + FAIL_ON(drm_mode_parse_command_line_for_connector( + "720x480,test=3D42", &no_connector, &mode)); =20 return 0; } @@ -1007,24 +786,14 @@ static int drm_cmdline_test_bpp_extra_and_option(voi= d *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24e,rotate=3D= 180", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); + drm_cmdline_test_res_init(ignored, &mode, "720x480-24e,rotate=3D180"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); FAIL_ON(mode.bpp !=3D 24); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); =20 return 0; } @@ -1033,22 +802,13 @@ static int drm_cmdline_test_extra_and_option(void *i= gnored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480e,rotate=3D180= ", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); + drm_cmdline_test_res_init(ignored, &mode, "720x480e,rotate=3D180"); =20 + FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); FAIL_ON(mode.refresh_specified); FAIL_ON(mode.bpp_specified); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); =20 return 0; } @@ -1057,23 +817,11 @@ static int drm_cmdline_test_freestanding_options(voi= d *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("margin_right=3D14,mar= gin_left=3D24,margin_bottom=3D36,margin_top=3D42", - &no_connector, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); + drm_cmdline_test_freestanding(ignored, &mode, + "margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_top=3D42", + &no_connector); =20 - FAIL_ON(mode.tv_margins.right !=3D 14); - FAIL_ON(mode.tv_margins.left !=3D 24); - FAIL_ON(mode.tv_margins.bottom !=3D 36); - FAIL_ON(mode.tv_margins.top !=3D 42); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } @@ -1082,23 +830,11 @@ static int drm_cmdline_test_freestanding_force_e_and= _options(void *ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("e,margin_right=3D14,m= argin_left=3D24,margin_bottom=3D36,margin_top=3D42", - &no_connector, - &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); + drm_cmdline_test_freestanding(ignored, &mode, + "e,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_top=3D4= 2", + &no_connector); =20 - FAIL_ON(mode.tv_margins.right !=3D 14); - FAIL_ON(mode.tv_margins.left !=3D 24); - FAIL_ON(mode.tv_margins.bottom !=3D 36); - FAIL_ON(mode.tv_margins.top !=3D 42); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); =20 return 0; } @@ -1107,20 +843,17 @@ static int drm_cmdline_test_panel_orientation(void *= ignored) { struct drm_cmdline_mode mode =3D { }; =20 - FAIL_ON(!drm_mode_parse_command_line_for_connector("panel_orientation=3Du= pside_down", - &no_connector, - &mode)); + FAIL_ON(!drm_mode_parse_command_line_for_connector( + "panel_orientation=3Dupside_down", &no_connector, &mode)); + FAIL_ON(mode.specified); FAIL_ON(mode.refresh_specified); FAIL_ON(mode.bpp_specified); =20 + FAIL_ON(mode.panel_orientation !=3D DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP); =20 - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); + drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); =20 return 0; } --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1852CC43334 for ; Wed, 15 Jun 2022 13:59:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355251AbiFON7n (ORCPT ); Wed, 15 Jun 2022 09:59:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355407AbiFON7c (ORCPT ); Wed, 15 Jun 2022 09:59:32 -0400 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA0D84505C for ; Wed, 15 Jun 2022 06:59:28 -0700 (PDT) Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-fe15832ce5so16561924fac.8 for ; Wed, 15 Jun 2022 06:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mkm59Dgia1/zjozCL2fuwDc3P+WW9JEUYgwmf/ZDrqc=; b=AOR8/62H+bXd1U1IFIWtJ2nT+PvicVCqbaSa0fVm+Cw/EOELRnb/14ISmBz8gcyBoE fNxhjCKalDptoJv2NWzvMgsltz7CsSn0HWn/ZlLHf/loOWuvchZLI4OZrlfFS1zsOV9P P2OrnfNNkKu7g0xmlJUfnc1yi1mez/dtV3lpjY/NDG/u0h/eQZ5CxsVkW6HdZTZJdjZB rGxBhrTeGdbCpNPXoz2EAD2WGYt3LqQF6hRgf1ucqpJCnt5X5TtKrB7xrppn19u8OpHD KcWvo3e8TyYbnncYyKSRi7YLEd5I59l9jXsFrTu16zBeeGIR4LdrGOepUEbdQBT9deBQ M/VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mkm59Dgia1/zjozCL2fuwDc3P+WW9JEUYgwmf/ZDrqc=; b=eDhqt2OJR20smz6W/vQL+IE9zEPP6rEZLF1uZ6UXIZl1RtzyLKSShShm60NNzDceL3 koGitICjyv2IVnt1beXaUPpJNLqz8cVvzzitxJJbSAbBsEHx8edA/K6cJrCtuwKMm1Hu QlAJmTp6NIVc4aKx6SIP7HixA3fDQ03X0HWMhDTSK2ZjMxc2x5+w3inJnh9CFXKRqgOR /fYoZnX0tfo3C8HL1LJx63iKN6PCXx+Meycx3/ONVSY4aC9vQPk85weR2JDgVP70xSTF KNY7o55Wz7fjw4tF5YZqTU+OmDUZc3M4XokYZYY4ahrX7aJXh+nry6fNONnISK4BNNB8 GhFw== X-Gm-Message-State: AJIora/H+L8GCmCJXY9x5HtuMaGWgtm9XzRuzAbsvN5EPqVVJPUWo3DT /KErvmWJx5KhyvQOgtXFvYPE4Q== X-Google-Smtp-Source: AGRyM1v28CjKQIXC1YRZc9NT1/NyHDpQtL4SkHOcBOtGNS5oqBrW8ONcaVZB1S35/ssBtMZW9gZdkw== X-Received: by 2002:a05:6870:344d:b0:fe:5131:8f74 with SMTP id i13-20020a056870344d00b000fe51318f74mr5201911oah.5.1655301567726; Wed, 15 Jun 2022 06:59:27 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:27 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= , Arthur Grillo Subject: [PATCH 03/10] drm: selftest: convert drm_cmdline_parser selftest to KUnit Date: Wed, 15 Jun 2022 10:58:17 -0300 Message-Id: <20220615135824.15522-4-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM cmdline parser selftest to the KUnit API. Co-developed-by: Arthur Grillo Signed-off-by: Arthur Grillo Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 2 +- .../gpu/drm/selftests/drm_cmdline_selftests.h | 68 -- .../drm/selftests/test-drm_cmdline_parser.c | 874 ------------------ drivers/gpu/drm/tests/.kunitconfig | 3 + drivers/gpu/drm/tests/Kconfig | 12 + drivers/gpu/drm/tests/Makefile | 1 + .../gpu/drm/tests/test-drm_cmdline_parser.c | 799 ++++++++++++++++ 7 files changed, 816 insertions(+), 943 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h delete mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c create mode 100644 drivers/gpu/drm/tests/.kunitconfig create mode 100644 drivers/gpu/drm/tests/test-drm_cmdline_parser.c diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 7a1a732e0a1b..8633bb9ea717 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -3,5 +3,5 @@ test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_= plane_helper.o \ test-drm_format.o test-drm_framebuffer.o \ test-drm_dp_mst_helper.o test-drm_rect.o =20 -obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o tes= t-drm_cmdline_parser.o \ +obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gp= u/drm/selftests/drm_cmdline_selftests.h deleted file mode 100644 index 29e367db6118..000000000000 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ /dev/null @@ -1,68 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* List each unit test as selftest(function) - * - * The name is used as both an enum and expanded as igt__name to create - * a module parameter. It must be unique and legal for a C identifier. - * - * Tests are executed in order by igt/drm_mm - */ - -#define cmdline_test(test) selftest(test, test) - -cmdline_test(drm_cmdline_test_force_d_only) -cmdline_test(drm_cmdline_test_force_D_only_dvi) -cmdline_test(drm_cmdline_test_force_D_only_hdmi) -cmdline_test(drm_cmdline_test_force_D_only_not_digital) -cmdline_test(drm_cmdline_test_force_e_only) -cmdline_test(drm_cmdline_test_margin_only) -cmdline_test(drm_cmdline_test_interlace_only) -cmdline_test(drm_cmdline_test_res) -cmdline_test(drm_cmdline_test_res_missing_x) -cmdline_test(drm_cmdline_test_res_missing_y) -cmdline_test(drm_cmdline_test_res_bad_y) -cmdline_test(drm_cmdline_test_res_missing_y_bpp) -cmdline_test(drm_cmdline_test_res_vesa) -cmdline_test(drm_cmdline_test_res_vesa_rblank) -cmdline_test(drm_cmdline_test_res_rblank) -cmdline_test(drm_cmdline_test_res_bpp) -cmdline_test(drm_cmdline_test_res_bad_bpp) -cmdline_test(drm_cmdline_test_res_refresh) -cmdline_test(drm_cmdline_test_res_bad_refresh) -cmdline_test(drm_cmdline_test_res_bpp_refresh) -cmdline_test(drm_cmdline_test_res_bpp_refresh_interlaced) -cmdline_test(drm_cmdline_test_res_bpp_refresh_margins) -cmdline_test(drm_cmdline_test_res_bpp_refresh_force_off) -cmdline_test(drm_cmdline_test_res_bpp_refresh_force_on_off) -cmdline_test(drm_cmdline_test_res_bpp_refresh_force_on) -cmdline_test(drm_cmdline_test_res_bpp_refresh_force_on_analog) -cmdline_test(drm_cmdline_test_res_bpp_refresh_force_on_digital) -cmdline_test(drm_cmdline_test_res_bpp_refresh_interlaced_margins_force_on) -cmdline_test(drm_cmdline_test_res_margins_force_on) -cmdline_test(drm_cmdline_test_res_vesa_margins) -cmdline_test(drm_cmdline_test_res_invalid_mode) -cmdline_test(drm_cmdline_test_res_bpp_wrong_place_mode) -cmdline_test(drm_cmdline_test_name) -cmdline_test(drm_cmdline_test_name_bpp) -cmdline_test(drm_cmdline_test_name_refresh) -cmdline_test(drm_cmdline_test_name_bpp_refresh) -cmdline_test(drm_cmdline_test_name_refresh_wrong_mode) -cmdline_test(drm_cmdline_test_name_refresh_invalid_mode) -cmdline_test(drm_cmdline_test_name_option) -cmdline_test(drm_cmdline_test_name_bpp_option) -cmdline_test(drm_cmdline_test_rotate_0) -cmdline_test(drm_cmdline_test_rotate_90) -cmdline_test(drm_cmdline_test_rotate_180) -cmdline_test(drm_cmdline_test_rotate_270) -cmdline_test(drm_cmdline_test_rotate_multiple) -cmdline_test(drm_cmdline_test_rotate_invalid_val) -cmdline_test(drm_cmdline_test_rotate_truncated) -cmdline_test(drm_cmdline_test_hmirror) -cmdline_test(drm_cmdline_test_vmirror) -cmdline_test(drm_cmdline_test_margin_options) -cmdline_test(drm_cmdline_test_multiple_options) -cmdline_test(drm_cmdline_test_invalid_option) -cmdline_test(drm_cmdline_test_bpp_extra_and_option) -cmdline_test(drm_cmdline_test_extra_and_option) -cmdline_test(drm_cmdline_test_freestanding_options) -cmdline_test(drm_cmdline_test_freestanding_force_e_and_options) -cmdline_test(drm_cmdline_test_panel_orientation) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/= gpu/drm/selftests/test-drm_cmdline_parser.c deleted file mode 100644 index 57a229c5fc35..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ /dev/null @@ -1,874 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2019 Bootlin - * Copyright (c) 2021 Ma=EF=BF=BDra Canal , - * Copyright (c) 2021 Arthur Grillo - */ - -#define pr_fmt(fmt) "drm_cmdline: " fmt - -#include -#include - -#include -#include - -#define TESTS "drm_cmdline_selftests.h" -#include "drm_selftest.h" -#include "test-drm_modeset_common.h" - -static const struct drm_connector no_connector =3D {}; - -static int drm_cmdline_test_properties(void *ignored, - struct drm_cmdline_mode *mode, enum drm_connector_force force) -{ - FAIL_ON(mode->rb); - FAIL_ON(mode->cvt); - FAIL_ON(mode->interlace); - FAIL_ON(mode->margins); - FAIL_ON(mode->force !=3D force); - - return 0; -} - -static int drm_cmdline_test_force_only(void *ignored, char *cmdline, - const struct drm_connector *connector, enum drm_connector_force force) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, - connector, &mode)); - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D force); - - return 0; -} - -static int drm_cmdline_test_freestanding(void *ignored, - struct drm_cmdline_mode *mode, char *cmdline, - const struct drm_connector *connector) -{ - FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, - connector, mode)); - FAIL_ON(mode->specified); - FAIL_ON(mode->refresh_specified); - FAIL_ON(mode->bpp_specified); - - FAIL_ON(mode->tv_margins.right !=3D 14); - FAIL_ON(mode->tv_margins.left !=3D 24); - FAIL_ON(mode->tv_margins.bottom !=3D 36); - FAIL_ON(mode->tv_margins.top !=3D 42); - - return 0; -} - -static int drm_cmdline_test_res_init(void *ignored, - struct drm_cmdline_mode *mode, char *cmdline) -{ - FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, - &no_connector, mode)); - FAIL_ON(!mode->specified); - FAIL_ON(mode->xres !=3D 720); - FAIL_ON(mode->yres !=3D 480); - - return 0; -} - -static int drm_cmdline_test_res_bpp_init(void *ignored, - struct drm_cmdline_mode *mode, char *cmdline) -{ - FAIL_ON(!drm_mode_parse_command_line_for_connector(cmdline, - &no_connector, mode)); - FAIL_ON(!mode->specified); - FAIL_ON(mode->xres !=3D 720); - FAIL_ON(mode->yres !=3D 480); - - FAIL_ON(!mode->refresh_specified); - FAIL_ON(mode->refresh !=3D 60); - FAIL_ON(!mode->bpp_specified); - FAIL_ON(mode->bpp !=3D 24); - - return 0; -} - -static int drm_cmdline_test_force_e_only(void *ignored) -{ - drm_cmdline_test_force_only(ignored, "e", &no_connector, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_force_D_only_not_digital(void *ignored) -{ - drm_cmdline_test_force_only(ignored, "D", &no_connector, DRM_FORCE_ON); - - return 0; -} - -static const struct drm_connector connector_hdmi =3D { - .connector_type =3D DRM_MODE_CONNECTOR_HDMIB, - -}; - -static int drm_cmdline_test_force_D_only_hdmi(void *ignored) -{ - drm_cmdline_test_force_only(ignored, "D", &connector_hdmi, - DRM_FORCE_ON_DIGITAL); - - return 0; -} - -static const struct drm_connector connector_dvi =3D { - .connector_type =3D DRM_MODE_CONNECTOR_DVII, - -}; - -static int drm_cmdline_test_force_D_only_dvi(void *ignored) -{ - drm_cmdline_test_force_only(ignored, "D", &connector_dvi, - DRM_FORCE_ON_DIGITAL); - - return 0; -} - -static int drm_cmdline_test_force_d_only(void *ignored) -{ - drm_cmdline_test_force_only(ignored, "d", &no_connector, DRM_FORCE_OFF); - - return 0; -} - -static int drm_cmdline_test_margin_only(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("m", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_interlace_only(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("i", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_missing_x(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("x480", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_missing_y(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("1024x", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_bad_y(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("1024xtest", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_missing_y_bpp(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("1024x-24", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_vesa(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480M"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(!mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_vesa_rblank(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480MR"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(!mode.rb); - FAIL_ON(!mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_rblank(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480R"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(!mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bpp(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480-24"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bad_bpp(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480-test", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_refresh(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480@60"); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bad_refresh(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480@refresh", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60"); - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_interlaced(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60i"); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(!mode.interlace); - FAIL_ON(mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_margins(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60m"); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(!mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_force_off(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60d"); - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_OFF); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_force_on_off(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480-24@60de", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_force_on(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60e"); - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_force_on_analog(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60D"); - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_force_on_digital(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - static const struct drm_connector connector =3D { - .connector_type =3D DRM_MODE_CONNECTOR_DVII, - }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480-24@60D", - &connector, &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(mode.xres !=3D 720); - FAIL_ON(mode.yres !=3D 480); - - FAIL_ON(!mode.refresh_specified); - FAIL_ON(mode.refresh !=3D 60); - - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON_DIGITAL); - - return 0; -} - -static int drm_cmdline_test_res_bpp_refresh_interlaced_margins_force_on(vo= id *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_bpp_init(ignored, &mode, "720x480-24@60ime"); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(!mode.interlace); - FAIL_ON(!mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_res_margins_force_on(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480me"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(!mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_res_vesa_margins(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480Mm"); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - FAIL_ON(mode.rb); - FAIL_ON(!mode.cvt); - FAIL_ON(mode.interlace); - FAIL_ON(!mode.margins); - FAIL_ON(mode.force !=3D DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_res_invalid_mode(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480f", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_res_bpp_wrong_place_mode(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("720x480e-24", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_name(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("NTSC", - &no_connector, - &mode)); - FAIL_ON(strcmp(mode.name, "NTSC")); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - return 0; -} - -static int drm_cmdline_test_name_bpp(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("NTSC-24", - &no_connector, - &mode)); - FAIL_ON(strcmp(mode.name, "NTSC")); - FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); - - FAIL_ON(mode.bpp !=3D 24); - - return 0; -} - -static int drm_cmdline_test_name_bpp_refresh(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("NTSC-24@60", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_name_refresh(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("NTSC@60", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_name_refresh_wrong_mode(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("NTSC@60m", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_name_refresh_invalid_mode(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector("NTSC@60f", - &no_connector, - &mode)); - - return 0; -} - -static int drm_cmdline_test_name_option(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("NTSC,rotate=3D180", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(strcmp(mode.name, "NTSC")); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); - - return 0; -} - -static int drm_cmdline_test_name_bpp_option(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector("NTSC-24,rotate=3D180", - &no_connector, - &mode)); - FAIL_ON(!mode.specified); - FAIL_ON(strcmp(mode.name, "NTSC")); - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - return 0; -} - -static int drm_cmdline_test_rotate_0(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D0"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_0); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_rotate_90(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D90"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_90); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_rotate_180(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D180"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_rotate_270(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D270"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_270); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_rotate_multiple(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector( - "720x480,rotate=3D0,rotate=3D90", &no_connector, &mode)); - - return 0; -} - -static int drm_cmdline_test_rotate_invalid_val(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector( - "720x480,rotate=3D42", &no_connector, &mode)); - - return 0; -} - -static int drm_cmdline_test_rotate_truncated(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector( - "720x480,rotate=3D", &no_connector, &mode)); - - return 0; -} - -static int drm_cmdline_test_hmirror(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,reflect_x"); - - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_X)); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_vmirror(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,reflect_y"); - - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_0 | DRM_MODE_REFLE= CT_Y)); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_margin_options(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, - "720x480,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_t= op=3D42"); - - FAIL_ON(mode.tv_margins.right !=3D 14); - FAIL_ON(mode.tv_margins.left !=3D 24); - FAIL_ON(mode.tv_margins.bottom !=3D 36); - FAIL_ON(mode.tv_margins.top !=3D 42); - - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_multiple_options(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480,rotate=3D270,reflect_x= "); - - FAIL_ON(mode.rotation_reflection !=3D (DRM_MODE_ROTATE_270 | DRM_MODE_REF= LECT_X)); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_invalid_option(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(drm_mode_parse_command_line_for_connector( - "720x480,test=3D42", &no_connector, &mode)); - - return 0; -} - -static int drm_cmdline_test_bpp_extra_and_option(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480-24e,rotate=3D180"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); - FAIL_ON(mode.refresh_specified); - FAIL_ON(!mode.bpp_specified); - FAIL_ON(mode.bpp !=3D 24); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_extra_and_option(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_res_init(ignored, &mode, "720x480e,rotate=3D180"); - - FAIL_ON(mode.rotation_reflection !=3D DRM_MODE_ROTATE_180); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_freestanding_options(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_freestanding(ignored, &mode, - "margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_top=3D42", - &no_connector); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -static int drm_cmdline_test_freestanding_force_e_and_options(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - drm_cmdline_test_freestanding(ignored, &mode, - "e,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_top=3D4= 2", - &no_connector); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_ON); - - return 0; -} - -static int drm_cmdline_test_panel_orientation(void *ignored) -{ - struct drm_cmdline_mode mode =3D { }; - - FAIL_ON(!drm_mode_parse_command_line_for_connector( - "panel_orientation=3Dupside_down", &no_connector, &mode)); - - FAIL_ON(mode.specified); - FAIL_ON(mode.refresh_specified); - FAIL_ON(mode.bpp_specified); - - - FAIL_ON(mode.panel_orientation !=3D DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP); - - drm_cmdline_test_properties(ignored, &mode, DRM_FORCE_UNSPECIFIED); - - return 0; -} - -#include "drm_selftest.c" - -static int __init test_drm_cmdline_init(void) -{ - int err; - - err =3D run_selftests(selftests, ARRAY_SIZE(selftests), NULL); - - return err > 0 ? 0 : err; -} -module_init(test_drm_cmdline_init); - -MODULE_AUTHOR("Maxime Ripard "); -MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/tests/.kunitconfig b/drivers/gpu/drm/tests/.ku= nitconfig new file mode 100644 index 000000000000..6ec04b4c979d --- /dev/null +++ b/drivers/gpu/drm/tests/.kunitconfig @@ -0,0 +1,3 @@ +CONFIG_KUNIT=3Dy +CONFIG_DRM=3Dy +CONFIG_DRM_KUNIT_TEST=3Dy diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index 686e134b88bf..14ee077cca54 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -25,4 +25,16 @@ config DRM_DAMAGE_HELPER_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_CMDLINE_PARSER_KUNIT_TEST + tristate "KUnit tests for DRM cmdline parser" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides a kunit module that can be used to run + an unit test on the DRM cmdline parser API. This option is not + useful for distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 3fef656dffb9..3ded14858e8c 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) +=3D test-drm_damage_helper.o +obj-$(CONFIG_DRM_CMDLINE_PARSER_KUNIT_TEST) +=3D test-drm_cmdline_parser.o diff --git a/drivers/gpu/drm/tests/test-drm_cmdline_parser.c b/drivers/gpu/= drm/tests/test-drm_cmdline_parser.c new file mode 100644 index 000000000000..27ad467eef1e --- /dev/null +++ b/drivers/gpu/drm/tests/test-drm_cmdline_parser.c @@ -0,0 +1,799 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2019 Bootlin + * Copyright (c) 2021 Ma=C3=ADra Canal , + * Copyright (c) 2021 Arthur Grillo + */ + +#include +#include +#include + +static const struct drm_connector no_connector =3D {}; + +static void drm_cmdline_test_properties(struct kunit *test, + struct drm_cmdline_mode *mode, + enum drm_connector_force force) +{ + KUNIT_EXPECT_FALSE(test, mode->rb); + KUNIT_EXPECT_FALSE(test, mode->cvt); + KUNIT_EXPECT_FALSE(test, mode->interlace); + KUNIT_EXPECT_FALSE(test, mode->margins); + KUNIT_EXPECT_EQ(test, mode->force, force); +} + +static void drm_cmdline_test_force_only(struct kunit *test, char *cmdline, + const struct drm_connector *connector, + enum drm_connector_force force) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline, + connector, &mode)); + KUNIT_EXPECT_FALSE(test, mode.specified); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, force); +} + +static void drm_cmdline_test_freestanding(struct kunit *test, + struct drm_cmdline_mode *mode, char *cmdline, + const struct drm_connector *connector) +{ + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline, + connector, mode)); + KUNIT_EXPECT_FALSE(test, mode->specified); + KUNIT_EXPECT_FALSE(test, mode->refresh_specified); + KUNIT_EXPECT_FALSE(test, mode->bpp_specified); + + KUNIT_EXPECT_EQ(test, mode->tv_margins.right, 14); + KUNIT_EXPECT_EQ(test, mode->tv_margins.left, 24); + KUNIT_EXPECT_EQ(test, mode->tv_margins.bottom, 36); + KUNIT_EXPECT_EQ(test, mode->tv_margins.top, 42); +} + +static void drm_cmdline_test_res_init(struct kunit *test, + struct drm_cmdline_mode *mode, char *cmdline) +{ + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline, + &no_connector, mode)); + KUNIT_EXPECT_TRUE(test, mode->specified); + KUNIT_EXPECT_EQ(test, mode->xres, 720); + KUNIT_EXPECT_EQ(test, mode->yres, 480); +} + +static void drm_cmdline_test_res_bpp_init(struct kunit *test, + struct drm_cmdline_mode *mode, char *cmdline) +{ + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline, + &no_connector, mode)); + KUNIT_EXPECT_TRUE(test, mode->specified); + KUNIT_EXPECT_EQ(test, mode->xres, 720); + KUNIT_EXPECT_EQ(test, mode->yres, 480); + + KUNIT_EXPECT_TRUE(test, mode->refresh_specified); + KUNIT_EXPECT_EQ(test, mode->refresh, 60); + KUNIT_EXPECT_TRUE(test, mode->bpp_specified); + KUNIT_EXPECT_EQ(test, mode->bpp, 24); +} + +static void drm_cmdline_test_force_e_only(struct kunit *test) +{ + drm_cmdline_test_force_only(test, "e", &no_connector, DRM_FORCE_ON); +} + +static void drm_cmdline_test_force_D_only_not_digital(struct kunit *test) +{ + drm_cmdline_test_force_only(test, "D", &no_connector, DRM_FORCE_ON); +} + +static const struct drm_connector connector_hdmi =3D { + .connector_type =3D DRM_MODE_CONNECTOR_HDMIB, +}; + +static void drm_cmdline_test_force_D_only_hdmi(struct kunit *test) +{ + drm_cmdline_test_force_only(test, "D", &connector_hdmi, + DRM_FORCE_ON_DIGITAL); +} + +static const struct drm_connector connector_dvi =3D { + .connector_type =3D DRM_MODE_CONNECTOR_DVII, +}; + +static void drm_cmdline_test_force_D_only_dvi(struct kunit *test) +{ + drm_cmdline_test_force_only(test, "D", &connector_dvi, + DRM_FORCE_ON_DIGITAL); +} + +static void drm_cmdline_test_force_d_only(struct kunit *test) +{ + drm_cmdline_test_force_only(test, "d", &no_connector, DRM_FORCE_OFF); +} + +static void drm_cmdline_test_margin_only(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, drm_mode_parse_command_line_for_connector("m", + &no_connector, &mode)); +} + +static void drm_cmdline_test_interlace_only(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, drm_mode_parse_command_line_for_connector("i", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_missing_x(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, drm_mode_parse_command_line_for_connector("x480", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_missing_y(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, drm_mode_parse_command_line_for_connector("1024x= ", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_bad_y(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("1024xtest", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_missing_y_bpp(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("1024x-24", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_vesa(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480M"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_TRUE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_vesa_rblank(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480MR"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_TRUE(test, mode.rb); + KUNIT_EXPECT_TRUE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_rblank(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480R"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_TRUE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bpp(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480-24"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_TRUE(test, mode.bpp_specified); + KUNIT_EXPECT_EQ(test, mode.bpp, 24); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bad_bpp(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480-test", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_refresh(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480@60"); + + KUNIT_EXPECT_TRUE(test, mode.refresh_specified); + KUNIT_EXPECT_EQ(test, mode.refresh, 60); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bad_refresh(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480@refresh", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_bpp_refresh(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60"); + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bpp_refresh_interlaced(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60i"); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_TRUE(test, mode.interlace); + KUNIT_EXPECT_FALSE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bpp_refresh_margins(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60m"); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_TRUE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_bpp_refresh_force_off(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60d"); + drm_cmdline_test_properties(test, &mode, DRM_FORCE_OFF); +} + +static void drm_cmdline_test_res_bpp_refresh_force_on_off(struct kunit *te= st) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480-24@60de", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_bpp_refresh_force_on(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60e"); + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON); +} + +static void drm_cmdline_test_res_bpp_refresh_force_on_analog(struct kunit = *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60D"); + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON); +} + +static void drm_cmdline_test_res_bpp_refresh_force_on_digital(struct kunit= *test) +{ + struct drm_cmdline_mode mode =3D { }; + static const struct drm_connector connector =3D { + .connector_type =3D DRM_MODE_CONNECTOR_DVII, + }; + + KUNIT_EXPECT_TRUE(test, + drm_mode_parse_command_line_for_connector("720x480-24@60D", + &connector, &mode)); + KUNIT_EXPECT_TRUE(test, mode.specified); + KUNIT_EXPECT_EQ(test, mode.xres, 720); + KUNIT_EXPECT_EQ(test, mode.yres, 480); + + KUNIT_EXPECT_TRUE(test, mode.refresh_specified); + KUNIT_EXPECT_EQ(test, mode.refresh, 60); + + KUNIT_EXPECT_TRUE(test, mode.bpp_specified); + KUNIT_EXPECT_EQ(test, mode.bpp, 24); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON_DIGITAL); +} + +static void drm_cmdline_test_res_bpp_refresh_interlaced_margins_force_on(s= truct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_bpp_init(test, &mode, "720x480-24@60ime"); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_TRUE(test, mode.interlace); + KUNIT_EXPECT_TRUE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_ON); +} + +static void drm_cmdline_test_res_margins_force_on(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480me"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_FALSE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_TRUE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_ON); +} + +static void drm_cmdline_test_res_vesa_margins(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480Mm"); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + KUNIT_EXPECT_FALSE(test, mode.rb); + KUNIT_EXPECT_TRUE(test, mode.cvt); + KUNIT_EXPECT_FALSE(test, mode.interlace); + KUNIT_EXPECT_TRUE(test, mode.margins); + KUNIT_EXPECT_EQ(test, mode.force, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_res_invalid_mode(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480f", + &no_connector, &mode)); +} + +static void drm_cmdline_test_res_bpp_wrong_place_mode(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480e-24", + &no_connector, &mode)); } + +static void drm_cmdline_test_name(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector("NTSC", + &no_connector, &mode)); + KUNIT_EXPECT_FALSE(test, strcmp(mode.name, "NTSC")); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); +} + +static void drm_cmdline_test_name_bpp(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector("NTSC-2= 4", + &no_connector, &mode)); + KUNIT_EXPECT_FALSE(test, strcmp(mode.name, "NTSC")); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_TRUE(test, mode.bpp_specified); + + KUNIT_EXPECT_EQ(test, mode.bpp, 24); +} + +static void drm_cmdline_test_name_bpp_refresh(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("NTSC-24@60", + &no_connector, &mode)); +} + +static void drm_cmdline_test_name_refresh(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("NTSC@60", + &no_connector, &mode)); +} + +static void drm_cmdline_test_name_refresh_wrong_mode(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("NTSC@60m", + &no_connector, &mode)); } + +static void drm_cmdline_test_name_refresh_invalid_mode(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("NTSC@60f", + &no_connector, &mode)); } + +static void drm_cmdline_test_name_option(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, + drm_mode_parse_command_line_for_connector("NTSC,rotate=3D180", + &no_connector, &mode)); + KUNIT_EXPECT_TRUE(test, mode.specified); + KUNIT_EXPECT_FALSE(test, strcmp(mode.name, "NTSC")); + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_180); +} + +static void drm_cmdline_test_name_bpp_option(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, + drm_mode_parse_command_line_for_connector("NTSC-24,rotate=3D180", + &no_connector, &mode)); + KUNIT_EXPECT_TRUE(test, mode.specified); + KUNIT_EXPECT_FALSE(test, strcmp(mode.name, "NTSC")); + KUNIT_EXPECT_FALSE(test, mode.rotation_reflection !=3D DRM_MODE_ROTATE_18= 0); + KUNIT_EXPECT_TRUE(test, mode.bpp_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp !=3D 24); +} + +static void drm_cmdline_test_rotate_0(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,rotate=3D0"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_0); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_rotate_90(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,rotate=3D90"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_90); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_rotate_180(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,rotate=3D180"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_180); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_rotate_270(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,rotate=3D270"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_270); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_rotate_multiple(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480,rotate=3D0,rotate= =3D90", + &no_connector, &mode)); +} + +static void drm_cmdline_test_rotate_invalid_val(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480,rotate=3D42", + &no_connector, &mode)); +} + +static void drm_cmdline_test_rotate_truncated(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480,rotate=3D", + &no_connector, &mode)); +} + +static void drm_cmdline_test_hmirror(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,reflect_x"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, + DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_X); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_vmirror(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,reflect_y"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, + DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_margin_options(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, + "720x480,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_t= op=3D42"); + + KUNIT_EXPECT_EQ(test, mode.tv_margins.right, 14); + KUNIT_EXPECT_EQ(test, mode.tv_margins.left, 24); + KUNIT_EXPECT_EQ(test, mode.tv_margins.bottom, 36); + KUNIT_EXPECT_EQ(test, mode.tv_margins.top, 42); + + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_multiple_options(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480,rotate=3D270,reflect_x"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, + DRM_MODE_ROTATE_270 | DRM_MODE_REFLECT_X); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_invalid_option(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_FALSE(test, + drm_mode_parse_command_line_for_connector("720x480,test=3D42", + &no_connector, &mode)); +} + +static void drm_cmdline_test_bpp_extra_and_option(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480-24e,rotate=3D180"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_180); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_TRUE(test, mode.bpp_specified); + KUNIT_EXPECT_EQ(test, mode.bpp, 24); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON); +} + +static void drm_cmdline_test_extra_and_option(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_res_init(test, &mode, "720x480e,rotate=3D180"); + + KUNIT_EXPECT_EQ(test, mode.rotation_reflection, DRM_MODE_ROTATE_180); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON); +} + +static void drm_cmdline_test_freestanding_options(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_freestanding(test, &mode, + "margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_to= p=3D42", + &no_connector); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static void drm_cmdline_test_freestanding_force_e_and_options(struct kunit= *test) +{ + struct drm_cmdline_mode mode =3D { }; + + drm_cmdline_test_freestanding(test, &mode, + "e,margin_right=3D14,margin_left=3D24,margin_bottom=3D36,margin_= top=3D42", + &no_connector); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_ON); +} + +static void drm_cmdline_test_panel_orientation(struct kunit *test) +{ + struct drm_cmdline_mode mode =3D { }; + + KUNIT_EXPECT_TRUE(test, + drm_mode_parse_command_line_for_connector("panel_orientation=3Dupside= _down", + &no_connector, &mode)); + + KUNIT_EXPECT_FALSE(test, mode.specified); + KUNIT_EXPECT_FALSE(test, mode.refresh_specified); + KUNIT_EXPECT_FALSE(test, mode.bpp_specified); + + + KUNIT_EXPECT_EQ(test, mode.panel_orientation, + DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP); + + drm_cmdline_test_properties(test, &mode, DRM_FORCE_UNSPECIFIED); +} + +static struct kunit_case drm_cmdline_parser_tests[] =3D { + KUNIT_CASE(drm_cmdline_test_force_d_only), + KUNIT_CASE(drm_cmdline_test_force_D_only_dvi), + KUNIT_CASE(drm_cmdline_test_force_D_only_hdmi), + KUNIT_CASE(drm_cmdline_test_force_D_only_not_digital), + KUNIT_CASE(drm_cmdline_test_force_e_only), + KUNIT_CASE(drm_cmdline_test_margin_only), + KUNIT_CASE(drm_cmdline_test_interlace_only), + KUNIT_CASE(drm_cmdline_test_res), + KUNIT_CASE(drm_cmdline_test_res_missing_x), + KUNIT_CASE(drm_cmdline_test_res_missing_y), + KUNIT_CASE(drm_cmdline_test_res_bad_y), + KUNIT_CASE(drm_cmdline_test_res_missing_y_bpp), + KUNIT_CASE(drm_cmdline_test_res_vesa), + KUNIT_CASE(drm_cmdline_test_res_vesa_rblank), + KUNIT_CASE(drm_cmdline_test_res_rblank), + KUNIT_CASE(drm_cmdline_test_res_bpp), + KUNIT_CASE(drm_cmdline_test_res_bad_bpp), + KUNIT_CASE(drm_cmdline_test_res_refresh), + KUNIT_CASE(drm_cmdline_test_res_bad_refresh), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_interlaced), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_margins), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_force_off), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_force_on_off), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_force_on), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_force_on_analog), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_force_on_digital), + KUNIT_CASE(drm_cmdline_test_res_bpp_refresh_interlaced_margins_force_on), + KUNIT_CASE(drm_cmdline_test_res_margins_force_on), + KUNIT_CASE(drm_cmdline_test_res_vesa_margins), + KUNIT_CASE(drm_cmdline_test_res_invalid_mode), + KUNIT_CASE(drm_cmdline_test_res_bpp_wrong_place_mode), + KUNIT_CASE(drm_cmdline_test_name), + KUNIT_CASE(drm_cmdline_test_name_bpp), + KUNIT_CASE(drm_cmdline_test_name_refresh), + KUNIT_CASE(drm_cmdline_test_name_bpp_refresh), + KUNIT_CASE(drm_cmdline_test_name_refresh_wrong_mode), + KUNIT_CASE(drm_cmdline_test_name_refresh_invalid_mode), + KUNIT_CASE(drm_cmdline_test_name_option), + KUNIT_CASE(drm_cmdline_test_name_bpp_option), + KUNIT_CASE(drm_cmdline_test_rotate_0), + KUNIT_CASE(drm_cmdline_test_rotate_90), + KUNIT_CASE(drm_cmdline_test_rotate_180), + KUNIT_CASE(drm_cmdline_test_rotate_270), + KUNIT_CASE(drm_cmdline_test_rotate_multiple), + KUNIT_CASE(drm_cmdline_test_rotate_invalid_val), + KUNIT_CASE(drm_cmdline_test_rotate_truncated), + KUNIT_CASE(drm_cmdline_test_hmirror), + KUNIT_CASE(drm_cmdline_test_vmirror), + KUNIT_CASE(drm_cmdline_test_margin_options), + KUNIT_CASE(drm_cmdline_test_multiple_options), + KUNIT_CASE(drm_cmdline_test_invalid_option), + KUNIT_CASE(drm_cmdline_test_bpp_extra_and_option), + KUNIT_CASE(drm_cmdline_test_extra_and_option), + KUNIT_CASE(drm_cmdline_test_freestanding_options), + KUNIT_CASE(drm_cmdline_test_freestanding_force_e_and_options), + KUNIT_CASE(drm_cmdline_test_panel_orientation), + {} +}; + +static struct kunit_suite drm_cmdline_parser_test_suite =3D { + .name =3D "drm_cmdline_parser_tests", + .test_cases =3D drm_cmdline_parser_tests +}; + +kunit_test_suite(drm_cmdline_parser_test_suite); + +MODULE_AUTHOR("Maxime Ripard "); +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37D1FC433EF for ; Wed, 15 Jun 2022 13:59:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355380AbiFON7r (ORCPT ); Wed, 15 Jun 2022 09:59:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355248AbiFON7g (ORCPT ); Wed, 15 Jun 2022 09:59:36 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C88AB31918 for ; Wed, 15 Jun 2022 06:59:34 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id f9-20020a9d2c09000000b0060bf1fa91f4so8892295otb.2 for ; Wed, 15 Jun 2022 06:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1YgpDW8OcfuUaHGsXGtV0UPJNBs2IDjKm2IqsW8qdoA=; b=rULljSkkSIIpiMsl9QbL8SEy9VxDXfYZTzhckRrYPn840UuL6cgvfC9w7FQvfBnFtf EIti0pqPs7i4jrO8ginb49DdR+LN1ExxWcx6uA4OSmfN69HclVUVqcmjNUykUF39jNGB Y2a6NlFfOPyaA1AYJK81CpyVD9Fto22S78duQU9VT2+fSClif41Vu8KnpkeVXCrcFBwt DXwiXD1vE0GdFTVPcf9Bzv0eTWrE7ARXFsioSvIcDj/K3iA3DIglzSYvWv+HwX7FCS3v b+RU8qFl7ZlHuMqwnGkLtW7JXPxcylW9r+DhIfQ5nWm5Vkwm7Qnp9MnHmBrroAyRcdpK Q4yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1YgpDW8OcfuUaHGsXGtV0UPJNBs2IDjKm2IqsW8qdoA=; b=29C1Kpl2ZiHRb62HPQ7Rp+NjxNq+064B1jJwUal2Xi2ZLeQqPCtjEQs0aAqWq8jO/r 2M18dGOxGggeXPRjEIOXR7FZtW5ayvhopgCTu46w3YecuwhJ7yOSKO9NKVrfgHDOHNeR U4VuaNMzJP55INkL7RwfVImtPCCu3DMbCSfdto/dVRaFE3gOdAn/6iu5vEP0tA9meEac F2MOLxZQ8J/mcExcG8NioMBzuKFqXHQWIGE4UkZydHR8shcfHIBOhSMvD1Kq2N6eh2i+ Bk+6q1VFwt4Xn2HWeupB3ALcmHXrYJlM1+jV3VevWwIujixP1pRLkbB1LBppjrAdARo2 MHcA== X-Gm-Message-State: AOAM532NPcnNT+4tMxjXpXyy2HFy2cNwufuWHPvErNIi0jnjktDT+InY DLWAWsTNmvFGd+pdckMZkkaonw== X-Google-Smtp-Source: ABdhPJwCP1tUNPBFjXJBT5TCCkC2QS5ArKRIC3u0+lel14vofiWNrdzoRJish+Xa1sU6L81jZLUMbQ== X-Received: by 2002:a05:6830:1691:b0:60c:1eb1:6ddf with SMTP id k17-20020a056830169100b0060c1eb16ddfmr4269841otr.205.1655301574035; Wed, 15 Jun 2022 06:59:34 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:33 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= , Carlos Veras , Matheus Vieira Subject: [PATCH 04/10] drm: selftest: convert drm_rect selftest to KUnit Date: Wed, 15 Jun 2022 10:58:18 -0300 Message-Id: <20220615135824.15522-5-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM rect selftest to the KUnit API. Co-developed-by: Carlos Veras Signed-off-by: Carlos Veras Co-developed-by: Matheus Vieira Signed-off-by: Matheus Vieira Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 2 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 4 - .../drm/selftests/test-drm_modeset_common.h | 4 - drivers/gpu/drm/tests/Kconfig | 12 ++ drivers/gpu/drm/tests/Makefile | 1 + .../drm/{selftests =3D> tests}/test-drm_rect.c | 124 +++++++++--------- 6 files changed, 79 insertions(+), 68 deletions(-) rename drivers/gpu/drm/{selftests =3D> tests}/test-drm_rect.c (53%) diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 8633bb9ea717..8a794914e328 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_plane_helper.o \ test-drm_format.o test-drm_framebuffer.o \ - test-drm_dp_mst_helper.o test-drm_rect.o + test-drm_dp_mst_helper.o =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h index 4787b3b70709..a3ca90307364 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -6,10 +6,6 @@ * * Tests are executed in order by igt/drm_selftests_helper */ -selftest(drm_rect_clip_scaled_div_by_zero, igt_drm_rect_clip_scaled_div_by= _zero) -selftest(drm_rect_clip_scaled_not_clipped, igt_drm_rect_clip_scaled_not_cl= ipped) -selftest(drm_rect_clip_scaled_clipped, igt_drm_rect_clip_scaled_clipped) -selftest(drm_rect_clip_scaled_signed_vs_unsigned, igt_drm_rect_clip_scaled= _signed_vs_unsigned) selftest(check_plane_state, igt_check_plane_state) selftest(check_drm_format_block_width, igt_check_drm_format_block_width) selftest(check_drm_format_block_height, igt_check_drm_format_block_height) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h index c29354e59cec..42a10d7da51c 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -16,10 +16,6 @@ =20 #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") =20 -int igt_drm_rect_clip_scaled_div_by_zero(void *ignored); -int igt_drm_rect_clip_scaled_not_clipped(void *ignored); -int igt_drm_rect_clip_scaled_clipped(void *ignored); -int igt_drm_rect_clip_scaled_signed_vs_unsigned(void *ignored); int igt_check_plane_state(void *ignored); int igt_check_drm_format_block_width(void *ignored); int igt_check_drm_format_block_height(void *ignored); diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index 14ee077cca54..bab6bf363363 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -37,4 +37,16 @@ config DRM_CMDLINE_PARSER_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_RECT_KUNIT_TEST + tristate "KUnit tests for DRM rect" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides a KUnit module that can be used to run + an unit test on the DRM rect API. This option is not + useful for distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 3ded14858e8c..d03e28724d47 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) +=3D test-drm_damage_helper.o obj-$(CONFIG_DRM_CMDLINE_PARSER_KUNIT_TEST) +=3D test-drm_cmdline_parser.o +obj-$(CONFIG_DRM_RECT_KUNIT_TEST) +=3D test-drm_rect.o diff --git a/drivers/gpu/drm/selftests/test-drm_rect.c b/drivers/gpu/drm/te= sts/test-drm_rect.c similarity index 53% rename from drivers/gpu/drm/selftests/test-drm_rect.c rename to drivers/gpu/drm/tests/test-drm_rect.c index 3a5ff38321f4..94336412d32d 100644 --- a/drivers/gpu/drm/selftests/test-drm_rect.c +++ b/drivers/gpu/drm/tests/test-drm_rect.c @@ -3,15 +3,10 @@ * Test cases for the drm_rect functions */ =20 -#define pr_fmt(fmt) "drm_rect: " fmt - -#include - +#include #include =20 -#include "test-drm_modeset_common.h" - -int igt_drm_rect_clip_scaled_div_by_zero(void *ignored) +static void igt_drm_rect_clip_scaled_div_by_zero(struct kunit *test) { struct drm_rect src, dst, clip; bool visible; @@ -24,20 +19,20 @@ int igt_drm_rect_clip_scaled_div_by_zero(void *ignored) drm_rect_init(&dst, 0, 0, 0, 0); drm_rect_init(&clip, 1, 1, 1, 1); visible =3D drm_rect_clip_scaled(&src, &dst, &clip); - FAIL(visible, "Destination not be visible\n"); - FAIL(drm_rect_visible(&src), "Source should not be visible\n"); + + KUNIT_EXPECT_FALSE_MSG(test, visible, "Destination not be visible\n"); + KUNIT_EXPECT_FALSE_MSG(test, drm_rect_visible(&src), "Source should not b= e visible\n"); =20 drm_rect_init(&src, 0, 0, 0, 0); drm_rect_init(&dst, 3, 3, 0, 0); drm_rect_init(&clip, 1, 1, 1, 1); visible =3D drm_rect_clip_scaled(&src, &dst, &clip); - FAIL(visible, "Destination not be visible\n"); - FAIL(drm_rect_visible(&src), "Source should not be visible\n"); =20 - return 0; + KUNIT_EXPECT_FALSE_MSG(test, visible, "Destination not be visible\n"); + KUNIT_EXPECT_FALSE_MSG(test, drm_rect_visible(&src), "Source should not b= e visible\n"); } =20 -int igt_drm_rect_clip_scaled_not_clipped(void *ignored) +static void igt_drm_rect_clip_scaled_not_clipped(struct kunit *test) { struct drm_rect src, dst, clip; bool visible; @@ -49,14 +44,14 @@ int igt_drm_rect_clip_scaled_not_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || src.y1 !=3D 0 || src.y2 !=3D 1 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 1 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 1 || dst.y1 !=3D 0 || dst.y2 !=3D 1, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 2:1 scaling */ drm_rect_init(&src, 0, 0, 2 << 16, 2 << 16); @@ -65,14 +60,14 @@ int igt_drm_rect_clip_scaled_not_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 2 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 2 << 16 || src.y1 !=3D 0 || src.y2 !=3D 2 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 1 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 1 || dst.y1 !=3D 0 || dst.y2 !=3D 1, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 1:2 scaling */ drm_rect_init(&src, 0, 0, 1 << 16, 1 << 16); @@ -81,19 +76,17 @@ int igt_drm_rect_clip_scaled_not_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || src.y1 !=3D 0 || src.y2 !=3D 1 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 2 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 2 || dst.y1 !=3D 0 || dst.y2 !=3D 2, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); - - return 0; + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); } =20 -int igt_drm_rect_clip_scaled_clipped(void *ignored) +static void igt_drm_rect_clip_scaled_clipped(struct kunit *test) { struct drm_rect src, dst, clip; bool visible; @@ -105,14 +98,14 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || src.y1 !=3D 0 || src.y2 !=3D 1 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 1 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 1 || dst.y1 !=3D 0 || dst.y2 !=3D 1, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 1:1 scaling bottom/right clip */ drm_rect_init(&src, 0, 0, 2 << 16, 2 << 16); @@ -121,14 +114,14 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 1 << 16 || src.x2 !=3D 2 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 1 << 16 || src.x2 !=3D 2 << 16 || src.y1 !=3D 1 << 16 || src.y2 !=3D 2 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 1 || dst.x2 !=3D 2 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 1 || dst.x2 !=3D 2 || dst.y1 !=3D 1 || dst.y2 !=3D 2, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 2:1 scaling top/left clip */ drm_rect_init(&src, 0, 0, 4 << 16, 4 << 16); @@ -137,14 +130,14 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 2 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 2 << 16 || src.y1 !=3D 0 || src.y2 !=3D 2 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 1 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 1 || dst.y1 !=3D 0 || dst.y2 !=3D 1, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 2:1 scaling bottom/right clip */ drm_rect_init(&src, 0, 0, 4 << 16, 4 << 16); @@ -153,14 +146,14 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 2 << 16 || src.x2 !=3D 4 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 2 << 16 || src.x2 !=3D 4 << 16 || src.y1 !=3D 2 << 16 || src.y2 !=3D 4 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 1 || dst.x2 !=3D 2 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 1 || dst.x2 !=3D 2 || dst.y1 !=3D 1 || dst.y2 !=3D 2, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 1:2 scaling top/left clip */ drm_rect_init(&src, 0, 0, 2 << 16, 2 << 16); @@ -169,14 +162,14 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 0 || src.x2 !=3D 1 << 16 || src.y1 !=3D 0 || src.y2 !=3D 1 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 0 || dst.x2 !=3D 2 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 0 || dst.x2 !=3D 2 || dst.y1 !=3D 0 || dst.y2 !=3D 2, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); =20 /* 1:2 scaling bottom/right clip */ drm_rect_init(&src, 0, 0, 2 << 16, 2 << 16); @@ -185,19 +178,17 @@ int igt_drm_rect_clip_scaled_clipped(void *ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(src.x1 !=3D 1 << 16 || src.x2 !=3D 2 << 16 || + KUNIT_EXPECT_FALSE_MSG(test, src.x1 !=3D 1 << 16 || src.x2 !=3D 2 << 16 || src.y1 !=3D 1 << 16 || src.y2 !=3D 2 << 16, "Source badly clipped\n"); - FAIL(dst.x1 !=3D 2 || dst.x2 !=3D 4 || + KUNIT_EXPECT_FALSE_MSG(test, dst.x1 !=3D 2 || dst.x2 !=3D 4 || dst.y1 !=3D 2 || dst.y2 !=3D 4, "Destination badly clipped\n"); - FAIL(!visible, "Destination should be visible\n"); - FAIL(!drm_rect_visible(&src), "Source should be visible\n"); - - return 0; + KUNIT_EXPECT_TRUE_MSG(test, visible, "Destination should be visible\n"); + KUNIT_EXPECT_TRUE_MSG(test, drm_rect_visible(&src), "Source should be vis= ible\n"); } =20 -int igt_drm_rect_clip_scaled_signed_vs_unsigned(void *ignored) +static void igt_drm_rect_clip_scaled_signed_vs_unsigned(struct kunit *test) { struct drm_rect src, dst, clip; bool visible; @@ -216,8 +207,23 @@ int igt_drm_rect_clip_scaled_signed_vs_unsigned(void *= ignored) =20 visible =3D drm_rect_clip_scaled(&src, &dst, &clip); =20 - FAIL(visible, "Destination should not be visible\n"); - FAIL(drm_rect_visible(&src), "Source should not be visible\n"); - - return 0; + KUNIT_EXPECT_FALSE_MSG(test, visible, "Destination should not be visible\= n"); + KUNIT_EXPECT_FALSE_MSG(test, drm_rect_visible(&src), "Source should not b= e visible\n"); } + +static struct kunit_case drm_rect_tests[] =3D { + KUNIT_CASE(igt_drm_rect_clip_scaled_div_by_zero), + KUNIT_CASE(igt_drm_rect_clip_scaled_not_clipped), + KUNIT_CASE(igt_drm_rect_clip_scaled_clipped), + KUNIT_CASE(igt_drm_rect_clip_scaled_signed_vs_unsigned), + { } +}; + +static struct kunit_suite drm_rect_test_suite =3D { + .name =3D "drm_rect_tests", + .test_cases =3D drm_rect_tests, +}; + +kunit_test_suite(drm_rect_test_suite); + +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA525CCA473 for ; Wed, 15 Jun 2022 14:00:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355547AbiFOOAP (ORCPT ); Wed, 15 Jun 2022 10:00:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355400AbiFOOAE (ORCPT ); Wed, 15 Jun 2022 10:00:04 -0400 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2B31396B9 for ; Wed, 15 Jun 2022 06:59:40 -0700 (PDT) Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-fe4ac3b87fso16611706fac.3 for ; Wed, 15 Jun 2022 06:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3o+3lNnwqFQ94D3TPn1rgyMtwSWotWDswTuItI3M9as=; b=fZyW+EP1M5E/N/zETrdAvk7H+cTEAcvocYgoaCdrF5pRuUnOTuGu+AbkoctbbGbJLJ /dS/+VFt0cBD57Ls+agQQMs4voM+ge/FDkvssuZo61GznboX/SZO9EUvVmYk+o0bf/0B XKOx9fuai6Xll6NHl5hv4h+fa55lQCZlikNDdb3fSb1eAWe0e1VKUvYQSP6GfKCT8GoK q6otsmCmFPK44+u44d+tLGYrLcYbxjFZm5ieNAkPN1hqEuRssrRGaedDB6mT/4NdiwSN a8AAnSKoxxikUOHbWuvxdjiKFmgDPmk3bDk7LKY0jyMTsbsBh62BuAqrBaoRkfJgT4pR 1T1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3o+3lNnwqFQ94D3TPn1rgyMtwSWotWDswTuItI3M9as=; b=q7vawQC+852W0QUH3CG1dk4TYOY4+Fkd9hfncQBnGNO9Dfd1ar1zrmMDBAvAFX5ePz rpYDlecbvF1H2yLV8YZyYkAJANxc0OFzCQ2OB85BCBxc+zkJ2aSF8lPVJF5Mm6AZsHZ4 MnCEfZ/P8FdAGeoxNSM1ZStR6QAGB342T63rxjysJhhXoYvTw0TZeckwVOOZsumGkKnR Q4BqU9bxiLR9m1DswzDU2L0vpVPMe2Li10nptYhE1s5DsqMZLwYbyx/Lz+EWQAbya9Hm 85bCEQY0+G4nt8J1Hu18f+w4qtVQkcO7n7TIgam/e5rvoqcjgR1P2pQw0DdLWT1/hlqR 3QjQ== X-Gm-Message-State: AJIora+/FsJqeqVZP7j7kk+jEvJ7Gj40Ka5qkoj0uSP3r8WqlJ7JqSli gSDAUNPRf2iiAjxgZpxeQWHiDQ== X-Google-Smtp-Source: AGRyM1vJWD7WtAzSTM93u9zTyTdzCYKpWo5FXioLQqw2lO0JjihJVPdGsfb4CoNi7OpM3zFRdjKEJw== X-Received: by 2002:a05:6870:3102:b0:101:15a2:9d7f with SMTP id v2-20020a056870310200b0010115a29d7fmr5602869oaa.36.1655301580039; Wed, 15 Jun 2022 06:59:40 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:39 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH 05/10] drm: selftest: convert drm_format selftest to KUnit Date: Wed, 15 Jun 2022 10:58:19 -0300 Message-Id: <20220615135824.15522-6-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM format selftest to the KUnit API. Signed-off-by: Ma=C3=ADra Canal Reported-by: kernel test robot Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 3 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 3 - drivers/gpu/drm/selftests/test-drm_format.c | 280 ----------------- .../drm/selftests/test-drm_modeset_common.h | 3 - drivers/gpu/drm/tests/Kconfig | 12 + drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/test-drm_format.c | 284 ++++++++++++++++++ 7 files changed, 298 insertions(+), 288 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/test-drm_format.c create mode 100644 drivers/gpu/drm/tests/test-drm_format.c diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 8a794914e328..b7f252d886d0 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_plane_helper.o \ - test-drm_format.o test-drm_framebuffer.o \ - test-drm_dp_mst_helper.o + test-drm_framebuffer.o test-drm_dp_mst_helper.o =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h index a3ca90307364..63061ef55eff 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -7,9 +7,6 @@ * Tests are executed in order by igt/drm_selftests_helper */ selftest(check_plane_state, igt_check_plane_state) -selftest(check_drm_format_block_width, igt_check_drm_format_block_width) -selftest(check_drm_format_block_height, igt_check_drm_format_block_height) -selftest(check_drm_format_min_pitch, igt_check_drm_format_min_pitch) selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode) selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decod= e) diff --git a/drivers/gpu/drm/selftests/test-drm_format.c b/drivers/gpu/drm/= selftests/test-drm_format.c deleted file mode 100644 index c5e212afa27a..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_format.c +++ /dev/null @@ -1,280 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Test cases for the drm_format functions - */ - -#define pr_fmt(fmt) "drm_format: " fmt - -#include -#include - -#include - -#include "test-drm_modeset_common.h" - -int igt_check_drm_format_block_width(void *ignored) -{ - const struct drm_format_info *info =3D NULL; - - /* Test invalid arguments */ - FAIL_ON(drm_format_info_block_width(info, 0) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, -1) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, 1) !=3D 0); - - /* Test 1 plane format */ - info =3D drm_format_info(DRM_FORMAT_XRGB4444); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_width(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 1) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, -1) !=3D 0); - - /* Test 2 planes format */ - info =3D drm_format_info(DRM_FORMAT_NV12); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_width(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 1) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 2) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, -1) !=3D 0); - - /* Test 3 planes format */ - info =3D drm_format_info(DRM_FORMAT_YUV422); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_width(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 1) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 2) !=3D 1); - FAIL_ON(drm_format_info_block_width(info, 3) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, -1) !=3D 0); - - /* Test a tiled format */ - info =3D drm_format_info(DRM_FORMAT_X0L0); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_width(info, 0) !=3D 2); - FAIL_ON(drm_format_info_block_width(info, 1) !=3D 0); - FAIL_ON(drm_format_info_block_width(info, -1) !=3D 0); - - return 0; -} - -int igt_check_drm_format_block_height(void *ignored) -{ - const struct drm_format_info *info =3D NULL; - - /* Test invalid arguments */ - FAIL_ON(drm_format_info_block_height(info, 0) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, -1) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, 1) !=3D 0); - - /* Test 1 plane format */ - info =3D drm_format_info(DRM_FORMAT_XRGB4444); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_height(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 1) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, -1) !=3D 0); - - /* Test 2 planes format */ - info =3D drm_format_info(DRM_FORMAT_NV12); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_height(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 1) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 2) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, -1) !=3D 0); - - /* Test 3 planes format */ - info =3D drm_format_info(DRM_FORMAT_YUV422); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_height(info, 0) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 1) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 2) !=3D 1); - FAIL_ON(drm_format_info_block_height(info, 3) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, -1) !=3D 0); - - /* Test a tiled format */ - info =3D drm_format_info(DRM_FORMAT_X0L0); - FAIL_ON(!info); - FAIL_ON(drm_format_info_block_height(info, 0) !=3D 2); - FAIL_ON(drm_format_info_block_height(info, 1) !=3D 0); - FAIL_ON(drm_format_info_block_height(info, -1) !=3D 0); - - return 0; -} - -int igt_check_drm_format_min_pitch(void *ignored) -{ - const struct drm_format_info *info =3D NULL; - - /* Test invalid arguments */ - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - /* Test 1 plane 8 bits per pixel format */ - info =3D drm_format_info(DRM_FORMAT_RGB332); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 1); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 640); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 1024); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 1920); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 4096); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 671); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX); - FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=3D - (uint64_t)(UINT_MAX - 1)); - - /* Test 1 plane 16 bits per pixel format */ - info =3D drm_format_info(DRM_FORMAT_XRGB4444); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 4); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 1280); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 2048); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 3840); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 8192); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 1342); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX * 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=3D - (uint64_t)(UINT_MAX - 1) * 2); - - /* Test 1 plane 24 bits per pixel format */ - info =3D drm_format_info(DRM_FORMAT_RGB888); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 3); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 6); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 1920); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 3072); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 5760); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 12288); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 2013); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX * 3); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=3D - (uint64_t)(UINT_MAX - 1) * 3); - - /* Test 1 plane 32 bits per pixel format */ - info =3D drm_format_info(DRM_FORMAT_ABGR8888); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 4); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 8); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 2560); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 4096); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 7680); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 16384); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 2684); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX * 4); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=3D - (uint64_t)(UINT_MAX - 1) * 4); - - /* Test 2 planes format */ - info =3D drm_format_info(DRM_FORMAT_NV12); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 2, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 1); - FAIL_ON(drm_format_info_min_pitch(info, 1, 1) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 1, 1) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 640); - FAIL_ON(drm_format_info_min_pitch(info, 1, 320) !=3D 640); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 1024); - FAIL_ON(drm_format_info_min_pitch(info, 1, 512) !=3D 1024); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 1920); - FAIL_ON(drm_format_info_min_pitch(info, 1, 960) !=3D 1920); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 4096); - FAIL_ON(drm_format_info_min_pitch(info, 1, 2048) !=3D 4096); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 671); - FAIL_ON(drm_format_info_min_pitch(info, 1, 336) !=3D 672); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX); - FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=3D - (uint64_t)UINT_MAX + 1); - FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=3D - (uint64_t)(UINT_MAX - 1)); - FAIL_ON(drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) / 2) !=3D - (uint64_t)(UINT_MAX - 1)); - - /* Test 3 planes 8 bits per pixel format */ - info =3D drm_format_info(DRM_FORMAT_YUV422); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 2, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 3, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 1); - FAIL_ON(drm_format_info_min_pitch(info, 1, 1) !=3D 1); - FAIL_ON(drm_format_info_min_pitch(info, 2, 1) !=3D 1); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 1, 2) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 2, 2) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 640); - FAIL_ON(drm_format_info_min_pitch(info, 1, 320) !=3D 320); - FAIL_ON(drm_format_info_min_pitch(info, 2, 320) !=3D 320); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 1024); - FAIL_ON(drm_format_info_min_pitch(info, 1, 512) !=3D 512); - FAIL_ON(drm_format_info_min_pitch(info, 2, 512) !=3D 512); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 1920); - FAIL_ON(drm_format_info_min_pitch(info, 1, 960) !=3D 960); - FAIL_ON(drm_format_info_min_pitch(info, 2, 960) !=3D 960); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 4096); - FAIL_ON(drm_format_info_min_pitch(info, 1, 2048) !=3D 2048); - FAIL_ON(drm_format_info_min_pitch(info, 2, 2048) !=3D 2048); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 671); - FAIL_ON(drm_format_info_min_pitch(info, 1, 336) !=3D 336); - FAIL_ON(drm_format_info_min_pitch(info, 2, 336) !=3D 336); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX); - FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=3D - (uint64_t)UINT_MAX / 2 + 1); - FAIL_ON(drm_format_info_min_pitch(info, 2, UINT_MAX / 2 + 1) !=3D - (uint64_t)UINT_MAX / 2 + 1); - FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1) / 2) !=3D - (uint64_t)(UINT_MAX - 1) / 2); - FAIL_ON(drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) / 2) !=3D - (uint64_t)(UINT_MAX - 1) / 2); - FAIL_ON(drm_format_info_min_pitch(info, 2, (UINT_MAX - 1) / 2) !=3D - (uint64_t)(UINT_MAX - 1) / 2); - - /* Test tiled format */ - info =3D drm_format_info(DRM_FORMAT_X0L2); - FAIL_ON(!info); - FAIL_ON(drm_format_info_min_pitch(info, 0, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, -1, 0) !=3D 0); - FAIL_ON(drm_format_info_min_pitch(info, 1, 0) !=3D 0); - - FAIL_ON(drm_format_info_min_pitch(info, 0, 1) !=3D 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, 2) !=3D 4); - FAIL_ON(drm_format_info_min_pitch(info, 0, 640) !=3D 1280); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) !=3D 2048); - FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) !=3D 3840); - FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) !=3D 8192); - FAIL_ON(drm_format_info_min_pitch(info, 0, 671) !=3D 1342); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=3D - (uint64_t)UINT_MAX * 2); - FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=3D - (uint64_t)(UINT_MAX - 1) * 2); - - return 0; -} diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h index 42a10d7da51c..5709d967a5c4 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -17,9 +17,6 @@ #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") =20 int igt_check_plane_state(void *ignored); -int igt_check_drm_format_block_width(void *ignored); -int igt_check_drm_format_block_height(void *ignored); -int igt_check_drm_format_min_pitch(void *ignored); int igt_check_drm_framebuffer_create(void *ignored); int igt_dp_mst_calc_pbn_mode(void *ignored); int igt_dp_mst_sideband_msg_req_decode(void *ignored); diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index bab6bf363363..7c4f76560152 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -49,4 +49,16 @@ config DRM_RECT_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_FORMAT_KUNIT_TEST + tristate "KUnit tests for DRM format" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides a KUnit module that can be used to run + an unit test on the DRM format API. This option is not + useful for distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index d03e28724d47..95d1f67f609d 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) +=3D test-drm_damage_helper.o obj-$(CONFIG_DRM_CMDLINE_PARSER_KUNIT_TEST) +=3D test-drm_cmdline_parser.o obj-$(CONFIG_DRM_RECT_KUNIT_TEST) +=3D test-drm_rect.o +obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) +=3D test-drm_format.o diff --git a/drivers/gpu/drm/tests/test-drm_format.c b/drivers/gpu/drm/test= s/test-drm_format.c new file mode 100644 index 000000000000..68bd1878c205 --- /dev/null +++ b/drivers/gpu/drm/tests/test-drm_format.c @@ -0,0 +1,284 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Test cases for the drm_format functions + */ + +#include +#include + +static void igt_check_drm_format_block_width(struct kunit *test) +{ + const struct drm_format_info *info =3D NULL; + + /* Test invalid arguments */ + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); + + /* Test 1 plane format */ + info =3D drm_format_info(DRM_FORMAT_XRGB4444); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); + + /* Test 2 planes format */ + info =3D drm_format_info(DRM_FORMAT_NV12); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 2)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); + + /* Test 3 planes format */ + info =3D drm_format_info(DRM_FORMAT_YUV422); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 2)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 3)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); + + /* Test a tiled format */ + info =3D drm_format_info(DRM_FORMAT_X0L0); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 2); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); +} + +static void igt_check_drm_format_block_height(struct kunit *test) +{ + const struct drm_format_info *info =3D NULL; + + /* Test invalid arguments */ + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); + + /* Test 1 plane format */ + info =3D drm_format_info(DRM_FORMAT_XRGB4444); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); + + /* Test 2 planes format */ + info =3D drm_format_info(DRM_FORMAT_NV12); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 2)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); + + /* Test 3 planes format */ + info =3D drm_format_info(DRM_FORMAT_YUV422); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1)); + KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 2)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 3)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); + + /* Test a tiled format */ + info =3D drm_format_info(DRM_FORMAT_X0L0); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 2); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); + KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); +} + +static void igt_check_drm_format_min_pitch(struct kunit *test) +{ + const struct drm_format_info *info =3D NULL; + + /* Test invalid arguments */ + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + /* Test 1 plane 8 bits per pixel format */ + info =3D drm_format_info(DRM_FORMAT_RGB332); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), + (uint64_t)(UINT_MAX - 1)); + + /* Test 1 plane 16 bits per pixel format */ + info =3D drm_format_info(DRM_FORMAT_XRGB4444); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1280); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 2048); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 3840); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 8192); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 1342); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX * 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), + (uint64_t)(UINT_MAX - 1) * 2); + + /* Test 1 plane 24 bits per pixel format */ + info =3D drm_format_info(DRM_FORMAT_RGB888); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 3); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 6); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1920); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 3072); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 5760); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 12288); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 2013); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX * 3); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), + (uint64_t)(UINT_MAX - 1) * 3); + + /* Test 1 plane 32 bits per pixel format */ + info =3D drm_format_info(DRM_FORMAT_ABGR8888); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 4); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 8); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 2560); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 4096); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 7680); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 16384); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 2684); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX * 4); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), + (uint64_t)(UINT_MAX - 1) * 4); + + /* Test 2 planes format */ + info =3D drm_format_info(DRM_FORMAT_NV12); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 320), 640); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 512), 1024); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 960), 1920); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 2048), 4096); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 336), 672); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1= ), + (uint64_t)UINT_MAX + 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), + (uint64_t)(UINT_MAX - 1)); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) /= 2), + (uint64_t)(UINT_MAX - 1)); + + /* Test 3 planes 8 bits per pixel format */ + info =3D drm_format_info(DRM_FORMAT_YUV422); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 3, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 1), 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 2), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 2), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 320), 320); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 320), 320); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 512), 512); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 512), 512); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 960), 960); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 960), 960); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 2048), 2048); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 2048), 2048); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 336), 336); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 336), 336); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1= ), + (uint64_t)UINT_MAX / 2 + 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, UINT_MAX / 2 + 1= ), + (uint64_t)UINT_MAX / 2 + 1); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1) /= 2), + (uint64_t)(UINT_MAX - 1) / 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) /= 2), + (uint64_t)(UINT_MAX - 1) / 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, (UINT_MAX - 1) /= 2), + (uint64_t)(UINT_MAX - 1) / 2); + + /* Test tiled format */ + info =3D drm_format_info(DRM_FORMAT_X0L2); + KUNIT_EXPECT_TRUE(test, info); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); + KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); + + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1280); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 2048); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 3840); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 8192); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 1342); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX), + (uint64_t)UINT_MAX * 2); + KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX - 1), + (uint64_t)(UINT_MAX - 1) * 2); +} + +static struct kunit_case drm_format_tests[] =3D { + KUNIT_CASE(igt_check_drm_format_block_width), + KUNIT_CASE(igt_check_drm_format_block_height), + KUNIT_CASE(igt_check_drm_format_min_pitch), + { } +}; + +static struct kunit_suite drm_format_test_suite =3D { + .name =3D "drm_format_tests", + .test_cases =3D drm_format_tests, +}; + +kunit_test_suite(drm_format_test_suite); + +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D09CDC43334 for ; Wed, 15 Jun 2022 14:00:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355400AbiFOOAR (ORCPT ); Wed, 15 Jun 2022 10:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355489AbiFOOAJ (ORCPT ); Wed, 15 Jun 2022 10:00:09 -0400 Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A3B745AEA for ; Wed, 15 Jun 2022 06:59:47 -0700 (PDT) Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-f2a4c51c45so16574794fac.9 for ; Wed, 15 Jun 2022 06:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=08N7YiGKX0jNilKmdhjsyfvhixOh2CcV1TwDxPITXG8=; b=akp8rGhKvMbS5UnNC5JI0a3vP3pjdLmy8+qAse8JqxQHms3yUBza7GKedmCpHcFvgG 6ofwDn3TPrq8bsWt45JMeC1uHCqo8dm9vTCORpYsThT4BQ0r0SNQ+XoEXyQxSkFnMXII k9JWNjxE2AWmIGXOHCKO0rDWUPOelAX8o2sQ4z8Oo9xb2i8MMTAsgnsZOzrt5CAZKtDx Ht8lxkpQsUTQizR8tGxh2RcPgQ1aBg+DrnpYsvlukMQ52eeH4gXEMFs+JVchkBLHQzPd w+dTFqqIrLV95q9adYN1gCJtZfShcqR5Xdz0VuHzy/VHf5ykxfIjyFWNph+AFj/cjC1C /yeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=08N7YiGKX0jNilKmdhjsyfvhixOh2CcV1TwDxPITXG8=; b=y2liWbNQeX+eMxo0Z1PCV1tWTKrM8szvqRM08g6stxzGkTo96S0lNn/cFnwy44SBua Q9yB10N/9YlJNh4tbaymtpWsmtT1Cm1LhDWWHvBucgb2eoPUro8r41MMseiUThPjS2yN wrjcdQAmJTLsL0Voru/W0L4Qo4d6tp9v9UKxXm+TAbjZ1+1Mag535CpU+6v08FrSYY3C k2iCQsfbaek6qRiO/umH6t9kGP3TeFtwVMIpyPymHDhsVNz3E1/snp9x5g8WKmImCMNJ BcYLpdTiAmJssP2dpu5XaZNpHjAlJJcKhPtyedddn03L6M0FNTyECA4V20TrckAH7k+A uqTw== X-Gm-Message-State: AJIora9oRZykabaX8CDUbbvRgfrkcHOmlzP7Ov3nJdN7cz8lPoc0I70/ qJJygIoPmRDszUfVCNlPypLjdQ== X-Google-Smtp-Source: AGRyM1vfnpZ29ACmpZQbV/GAMT2TO/QO2cAyQJQaYsEjoxGdyhNcxoWYIO4Klm/OFZo19UHdobw/dg== X-Received: by 2002:a05:6871:14e:b0:f3:4d16:c42b with SMTP id z14-20020a056871014e00b000f34d16c42bmr5511174oab.232.1655301586317; Wed, 15 Jun 2022 06:59:46 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:45 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= , "Djakson C . G . Filho" , Anderson Fraga Subject: [PATCH 06/10] drm: selftest: convert drm_plane_helper selftest to KUnit Date: Wed, 15 Jun 2022 10:58:20 -0300 Message-Id: <20220615135824.15522-7-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM plane helper selftest to the KUnit API. Co-developed-by: Djakson C. G. Filho Signed-off-by: Djakson C. G. Filho Co-developed-by: Anderson Fraga Signed-off-by: Anderson Fraga Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 4 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 1 - .../drm/selftests/test-drm_modeset_common.h | 1 - drivers/gpu/drm/tests/Kconfig | 12 +++ drivers/gpu/drm/tests/Makefile | 1 + .../test-drm_plane_helper.c | 101 ++++++++++-------- 6 files changed, 70 insertions(+), 50 deletions(-) rename drivers/gpu/drm/{selftests =3D> tests}/test-drm_plane_helper.c (62%) diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index b7f252d886d0..9e0ccb482841 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_plane_helper.o \ - test-drm_framebuffer.o test-drm_dp_mst_helper.o +test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_framebuffer.o \ + test-drm_dp_mst_helper.o =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h index 63061ef55eff..22e467f6465a 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -6,7 +6,6 @@ * * Tests are executed in order by igt/drm_selftests_helper */ -selftest(check_plane_state, igt_check_plane_state) selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode) selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decod= e) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h index 5709d967a5c4..790f3cf31f0d 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -16,7 +16,6 @@ =20 #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") =20 -int igt_check_plane_state(void *ignored); int igt_check_drm_framebuffer_create(void *ignored); int igt_dp_mst_calc_pbn_mode(void *ignored); int igt_dp_mst_sideband_msg_req_decode(void *ignored); diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index 7c4f76560152..5aa8ac2dd28e 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -61,4 +61,16 @@ config DRM_FORMAT_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_PLANE_HELPER_KUNIT_TEST + tristate "KUnit tests for DRM plane helper" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides KUnit modules that can be used to run + various selftests on parts of the DRM plane helper API. This + option is not useful for distributions or general kernels, but only + for kernel developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 95d1f67f609d..6e3a10806cd8 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) +=3D test-drm_da= mage_helper.o obj-$(CONFIG_DRM_CMDLINE_PARSER_KUNIT_TEST) +=3D test-drm_cmdline_parser.o obj-$(CONFIG_DRM_RECT_KUNIT_TEST) +=3D test-drm_rect.o obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) +=3D test-drm_format.o +obj-$(CONFIG_DRM_PLANE_HELPER_KUNIT_TEST) +=3D test-drm_plane_helper.o diff --git a/drivers/gpu/drm/selftests/test-drm_plane_helper.c b/drivers/gp= u/drm/tests/test-drm_plane_helper.c similarity index 62% rename from drivers/gpu/drm/selftests/test-drm_plane_helper.c rename to drivers/gpu/drm/tests/test-drm_plane_helper.c index b61273e9c403..354c2c8d9f1c 100644 --- a/drivers/gpu/drm/selftests/test-drm_plane_helper.c +++ b/drivers/gpu/drm/tests/test-drm_plane_helper.c @@ -3,14 +3,11 @@ * Test cases for the drm_plane_helper functions */ =20 -#define pr_fmt(fmt) "drm_plane_helper: " fmt - +#include #include #include #include =20 -#include "test-drm_modeset_common.h" - static void set_src(struct drm_plane_state *plane_state, unsigned src_x, unsigned src_y, unsigned src_w, unsigned src_h) @@ -73,7 +70,7 @@ static bool check_crtc_eq(struct drm_plane_state *plane_s= tate, return true; } =20 -int igt_check_plane_state(void *ignored) +static void igt_check_plane_state(struct kunit *test) { int ret; =20 @@ -108,10 +105,10 @@ int igt_check_plane_state(void *ignored) DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(ret < 0, "Simple clipping check should pass\n"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 1024 << 16, 768 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple clipping check should pass\n= "); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 1024 << 16, 768 = << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); =20 /* Rotated clipping + reflection, no scaling. */ plane_state.rotation =3D DRM_MODE_ROTATE_90 | DRM_MODE_REFLECT_X; @@ -119,10 +116,10 @@ int igt_check_plane_state(void *ignored) DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(ret < 0, "Rotated clipping check should pass\n"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 768 << 16, 1024 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Rotated clipping check should pass\= n"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 768 << 16, 1024 = << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); plane_state.rotation =3D DRM_MODE_ROTATE_0; =20 /* Check whether positioning works correctly. */ @@ -132,16 +129,17 @@ int igt_check_plane_state(void *ignored) DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(!ret, "Should not be able to position on the crtc with can_position= =3Dfalse\n"); + KUNIT_EXPECT_TRUE_MSG(test, ret, + "Should not be able to position on the crtc with can_position=3Dfalse\n= "); =20 ret =3D drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, true, false); - FAIL(ret < 0, "Simple positioning should work\n"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 1023 << 16, 767 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1023, 767)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple positioning should work\n"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 1023 << 16, 767 = << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1023, 767)); =20 /* Simple scaling tests. */ set_src(&plane_state, 0, 0, 512 << 16, 384 << 16); @@ -150,28 +148,28 @@ int igt_check_plane_state(void *ignored) 0x8001, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(!ret, "Upscaling out of range should fail.\n"); + KUNIT_EXPECT_TRUE_MSG(test, ret, "Upscaling out of range should fail.\n"); ret =3D drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 0x8000, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(ret < 0, "Upscaling exactly 2x should work\n"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 512 << 16, 384 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Upscaling exactly 2x should work\n"= ); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 512 << 16, 384 <= < 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); =20 set_src(&plane_state, 0, 0, 2048 << 16, 1536 << 16); ret =3D drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, DRM_PLANE_HELPER_NO_SCALING, 0x1ffff, false, false); - FAIL(!ret, "Downscaling out of range should fail.\n"); + KUNIT_EXPECT_TRUE_MSG(test, ret, "Downscaling out of range should fail.\n= "); ret =3D drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, DRM_PLANE_HELPER_NO_SCALING, 0x20000, false, false); - FAIL(ret < 0, "Should succeed with exact scaling limit\n"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 2048 << 16, 1536 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed with exact scaling l= imit\n"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 2048 << 16, 1536= << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); =20 /* Testing rounding errors. */ set_src(&plane_state, 0, 0, 0x40001, 0x40001); @@ -180,10 +178,10 @@ int igt_check_plane_state(void *ignored) DRM_PLANE_HELPER_NO_SCALING, 0x10001, true, false); - FAIL(ret < 0, "Should succeed by clipping to exact multiple"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 2 << 16, 2 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 1022, 766, 2, 2)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact= multiple"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 2 << 16, 2 << 16= )); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 1022, 766, 2, 2)); =20 set_src(&plane_state, 0x20001, 0x20001, 0x4040001, 0x3040001); set_crtc(&plane_state, -2, -2, 1028, 772); @@ -191,10 +189,10 @@ int igt_check_plane_state(void *ignored) DRM_PLANE_HELPER_NO_SCALING, 0x10001, false, false); - FAIL(ret < 0, "Should succeed by clipping to exact multiple"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0x40002, 0x40002, 1024 << 16, 768 << = 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact= multiple"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0x40002, 0x40002, 1024= << 16, 768 << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); =20 set_src(&plane_state, 0, 0, 0x3ffff, 0x3ffff); set_crtc(&plane_state, 1022, 766, 4, 4); @@ -202,11 +200,11 @@ int igt_check_plane_state(void *ignored) 0xffff, DRM_PLANE_HELPER_NO_SCALING, true, false); - FAIL(ret < 0, "Should succeed by clipping to exact multiple"); - FAIL_ON(!plane_state.visible); + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact= multiple"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); /* Should not be rounded to 0x20001, which would be upscaling. */ - FAIL_ON(!check_src_eq(&plane_state, 0, 0, 2 << 16, 2 << 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 1022, 766, 2, 2)); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0, 0, 2 << 16, 2 << 16= )); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 1022, 766, 2, 2)); =20 set_src(&plane_state, 0x1ffff, 0x1ffff, 0x403ffff, 0x303ffff); set_crtc(&plane_state, -2, -2, 1028, 772); @@ -214,10 +212,21 @@ int igt_check_plane_state(void *ignored) 0xffff, DRM_PLANE_HELPER_NO_SCALING, false, false); - FAIL(ret < 0, "Should succeed by clipping to exact multiple"); - FAIL_ON(!plane_state.visible); - FAIL_ON(!check_src_eq(&plane_state, 0x3fffe, 0x3fffe, 1024 << 16, 768 << = 16)); - FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); - - return 0; + KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact= multiple"); + KUNIT_EXPECT_TRUE(test, plane_state.visible); + KUNIT_EXPECT_TRUE(test, check_src_eq(&plane_state, 0x3fffe, 0x3fffe, + 1024 << 16, 768 << 16)); + KUNIT_EXPECT_TRUE(test, check_crtc_eq(&plane_state, 0, 0, 1024, 768)); } + +static struct kunit_case drm_plane_helper_test[] =3D { + KUNIT_CASE(igt_check_plane_state), + {} +}; + +static struct kunit_suite drm_plane_helper_test_suite =3D { + .name =3D "drm_plane_helper_test", + .test_cases =3D drm_plane_helper_test, +}; + +kunit_test_suite(drm_plane_helper_test_suite); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4113BC43334 for ; Wed, 15 Jun 2022 14:00:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355747AbiFOOAa (ORCPT ); Wed, 15 Jun 2022 10:00:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355650AbiFOOAM (ORCPT ); Wed, 15 Jun 2022 10:00:12 -0400 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A42B483B3 for ; Wed, 15 Jun 2022 06:59:53 -0700 (PDT) Received: by mail-oi1-x22d.google.com with SMTP id p8so11203151oip.8 for ; Wed, 15 Jun 2022 06:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vqX7pyDsRsnxVd7um6ECYDVkH+sbOxfeN1/XFEFnRl4=; b=HP18Pp2gTfz2A896UOXh17WQmM71eUS6AdPv/aIDtt2kzIF/fuhOTehJfyC8qXiajv Gqkm22j9ENm+RY2uCdHL5tH0uNvQN0EBl74fPehaqQxKfp6ArY3hPlYcIJkEfX4XGXRR cUeV6LdRX9195bozYfAWwQBVkNWhuMsMBewLMBB1QQYyPuzaZcdW9ggMy4ZC5JdYrTXN gNNlseBgylrId9/jWq5YzBdEHXKvhIRqE12ZvSGTFKYmaCYPgAbnsTQtyffjnyLGH2Ns TGU4ajvZ3HgT2D42+HW27qYkFVjfMCwS8HJ13PJBnYPWLZxt4G19PNuYRZ0dcCPKB0PM 2VEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqX7pyDsRsnxVd7um6ECYDVkH+sbOxfeN1/XFEFnRl4=; b=OPqfs9Dw6Mcetx+CccMGobPBhqx0Fv5bY5Ef3v0jmcxJAkChIXQZzRqcGTH9H/neBJ UcgYMReHj7D98DjEhchi8gj50lI3QsQYVa/kfy2P9w2oe80+Id80Bjlh3Y3aHPtvFGMd MXTtIEgwzBRgVuCmrxIjAsqVo5F99ig2QeIGQLjApFLfjN992VwtKykUCSR8IcZOsP/b PH9IWuIHWrruaT9TcyccjSdM+OQileB6RxU1jzbRR1TKdAYetDkTeTEDKeFVj22KNHMw 0D2tONb/pwGgxENi+AuypYKaoVjnBUUX+Hd+Ek/OX0dRjdJgevYW6vRY204yDfYMfadV 7U0g== X-Gm-Message-State: AOAM533wFW951s4SIhBRoS6hRsv6exGvHR/J0rl7G9b4XWrWw2tFV1Q2 6RxNmMS422xIVJWdqE8eXd/QpQ== X-Google-Smtp-Source: ABdhPJy1WggQTSsvEhrVpfeG5oP8kP/8bOl2j0L6cRLZA86A2Rdk3m1yOt3Yh9yEhs35b+hmkBV/Yg== X-Received: by 2002:a54:4419:0:b0:32e:7cc0:de67 with SMTP id k25-20020a544419000000b0032e7cc0de67mr5044939oiw.51.1655301592448; Wed, 15 Jun 2022 06:59:52 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:51 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= , Rubens Gomes Neto Subject: [PATCH 07/10] drm: selftest: convert drm_dp_mst_helper selftest to KUnit Date: Wed, 15 Jun 2022 10:58:21 -0300 Message-Id: <20220615135824.15522-8-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM DP MST helper selftest to the KUnit API. Co-developed-by: Rubens Gomes Neto Signed-off-by: Rubens Gomes Neto Signed-off-by: Ma=C3=ADra Canal Reported-by: kernel test robot Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 3 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 2 - .../drm/selftests/test-drm_modeset_common.h | 2 - drivers/gpu/drm/tests/Kconfig | 13 +++ drivers/gpu/drm/tests/Makefile | 1 + .../test-drm_dp_mst_helper.c | 82 ++++++++++--------- 6 files changed, 59 insertions(+), 44 deletions(-) rename drivers/gpu/drm/{selftests =3D> tests}/test-drm_dp_mst_helper.c (73= %) diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 9e0ccb482841..1539f55db9a7 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_framebuffer.o \ - test-drm_dp_mst_helper.o +test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_framebuffer.o =20 obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h index 22e467f6465a..40a29b8cf386 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -7,5 +7,3 @@ * Tests are executed in order by igt/drm_selftests_helper */ selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) -selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode) -selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decod= e) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h index 790f3cf31f0d..3feb2fea1a6b 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -17,7 +17,5 @@ #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") =20 int igt_check_drm_framebuffer_create(void *ignored); -int igt_dp_mst_calc_pbn_mode(void *ignored); -int igt_dp_mst_sideband_msg_req_decode(void *ignored); =20 #endif diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index 5aa8ac2dd28e..eea0783f981d 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -73,4 +73,17 @@ config DRM_PLANE_HELPER_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_DP_MST_HELPER_KUNIT_TEST + tristate "KUnit tests for DRM DP MST helper" if !DRM_KUNIT_TEST + select DRM_DISPLAY_HELPER + select DRM_DISPLAY_DP_HELPER + default y if DRM_KUNIT_TEST + help + This option provides a kunit module that can be used to run + an unit test on the DRM DP MST helper API. This option is not + useful for distributions or general kernels, but only for kernel + developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 6e3a10806cd8..735ca8e4c446 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_DRM_CMDLINE_PARSER_KUNIT_TEST) +=3D test-drm_c= mdline_parser.o obj-$(CONFIG_DRM_RECT_KUNIT_TEST) +=3D test-drm_rect.o obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) +=3D test-drm_format.o obj-$(CONFIG_DRM_PLANE_HELPER_KUNIT_TEST) +=3D test-drm_plane_helper.o +obj-$(CONFIG_DRM_DP_MST_HELPER_KUNIT_TEST) +=3D test-drm_dp_mst_helper.o diff --git a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c b/drivers/g= pu/drm/tests/test-drm_dp_mst_helper.c similarity index 73% rename from drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c rename to drivers/gpu/drm/tests/test-drm_dp_mst_helper.c index 967c52150b67..88120e878a15 100644 --- a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +++ b/drivers/gpu/drm/tests/test-drm_dp_mst_helper.c @@ -5,15 +5,15 @@ =20 #define PREFIX_STR "[drm_dp_mst_helper]" =20 +#include #include =20 #include #include =20 #include "../display/drm_dp_mst_topology_internal.h" -#include "test-drm_modeset_common.h" =20 -int igt_dp_mst_calc_pbn_mode(void *ignored) +static void igt_dp_mst_calc_pbn_mode(struct kunit *test) { int pbn, i; const struct { @@ -33,13 +33,11 @@ int igt_dp_mst_calc_pbn_mode(void *ignored) pbn =3D drm_dp_calc_pbn_mode(test_params[i].rate, test_params[i].bpp, test_params[i].dsc); - FAIL(pbn !=3D test_params[i].expected, + KUNIT_EXPECT_EQ_MSG(test, pbn, test_params[i].expected, "Expected PBN %d for clock %d bpp %d, got %d\n", test_params[i].expected, test_params[i].rate, test_params[i].bpp, pbn); } - - return 0; } =20 static bool @@ -176,66 +174,64 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband= _msg_req_body *in) return result; } =20 -int igt_dp_mst_sideband_msg_req_decode(void *unused) +static void igt_dp_mst_sideband_msg_req_decode(struct kunit *test) { struct drm_dp_sideband_msg_req_body in =3D { 0 }; u8 data[] =3D { 0xff, 0x0, 0xdd }; int i; =20 -#define DO_TEST() FAIL_ON(!sideband_msg_req_encode_decode(&in)) - in.req_type =3D DP_ENUM_PATH_RESOURCES; in.u.port_num.port_number =3D 5; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_POWER_UP_PHY; in.u.port_num.port_number =3D 5; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_POWER_DOWN_PHY; in.u.port_num.port_number =3D 5; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_ALLOCATE_PAYLOAD; in.u.allocate_payload.number_sdp_streams =3D 3; for (i =3D 0; i < in.u.allocate_payload.number_sdp_streams; i++) in.u.allocate_payload.sdp_stream_sink[i] =3D i + 1; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.allocate_payload.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.allocate_payload.vcpi =3D 0x7f; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.allocate_payload.pbn =3D U16_MAX; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_QUERY_PAYLOAD; in.u.query_payload.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.query_payload.vcpi =3D 0x7f; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_REMOTE_DPCD_READ; in.u.dpcd_read.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.dpcd_read.dpcd_address =3D 0xfedcb; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.dpcd_read.num_bytes =3D U8_MAX; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_REMOTE_DPCD_WRITE; in.u.dpcd_write.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.dpcd_write.dpcd_address =3D 0xfedcb; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.dpcd_write.num_bytes =3D ARRAY_SIZE(data); in.u.dpcd_write.bytes =3D data; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_REMOTE_I2C_READ; in.u.i2c_read.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.i2c_read.read_i2c_device_id =3D 0x7f; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.i2c_read.num_transactions =3D 3; in.u.i2c_read.num_bytes_read =3D ARRAY_SIZE(data) * 3; for (i =3D 0; i < in.u.i2c_read.num_transactions; i++) { @@ -244,32 +240,42 @@ int igt_dp_mst_sideband_msg_req_decode(void *unused) in.u.i2c_read.transactions[i].i2c_dev_id =3D 0x7f & ~i; in.u.i2c_read.transactions[i].i2c_transaction_delay =3D 0xf & ~i; } - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_REMOTE_I2C_WRITE; in.u.i2c_write.port_number =3D 0xf; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.i2c_write.write_i2c_device_id =3D 0x7f; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.i2c_write.num_bytes =3D ARRAY_SIZE(data); in.u.i2c_write.bytes =3D data; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); =20 in.req_type =3D DP_QUERY_STREAM_ENC_STATUS; in.u.enc_status.stream_id =3D 1; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); get_random_bytes(in.u.enc_status.client_id, sizeof(in.u.enc_status.client_id)); - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.enc_status.stream_event =3D 3; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.enc_status.valid_stream_event =3D 0; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.enc_status.stream_behavior =3D 3; - DO_TEST(); + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); in.u.enc_status.valid_stream_behavior =3D 1; - DO_TEST(); - -#undef DO_TEST - return 0; + KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in)); } + +static struct kunit_case drm_dp_mst_helper_tests[] =3D { + KUNIT_CASE(igt_dp_mst_calc_pbn_mode), + KUNIT_CASE(igt_dp_mst_sideband_msg_req_decode), + { } +}; + +static struct kunit_suite drm_dp_mst_helper_test_suite =3D { + .name =3D "drm_dp_mst_helper_tests", + .test_cases =3D drm_dp_mst_helper_tests, +}; + +kunit_test_suite(drm_dp_mst_helper_test_suite); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0A45C433EF for ; Wed, 15 Jun 2022 14:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238981AbiFOOAf (ORCPT ); Wed, 15 Jun 2022 10:00:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355476AbiFOOAO (ORCPT ); Wed, 15 Jun 2022 10:00:14 -0400 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2376849F09 for ; Wed, 15 Jun 2022 06:59:59 -0700 (PDT) Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-fe15832ce5so16561924fac.8 for ; Wed, 15 Jun 2022 06:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hM+JY40z0Sp//jmnsAggmvbu6S59VsvwNNKMeBMBEXU=; b=E/dfccgC/8TdlYB8aK4U8u1Mi3ftEqE5XWxpm/4CSt/+yIVvyW2xoa6NYjw8+wWmA/ /CJ9BRlOZGaQ4trK+zo+XL4JtjmtP7sWYi6xQFXQgTQvQmK03vkDgrGcF7xKpl45I/Hd ei36k2v8u8wpW2VqmJnwnHjOkcJP74EQhQy4zYuuPubNDPGt83zH7fxRB/meZdJdJ65i jcyuPd4GUxOlJqyyfDkweFR7v0xW5Z0x87EmcGGcCv5K0/4Bq/snevbGqoicFxvLjz2A ADjkmGNffPv3kvO/TnD4JNSFr2Dou2eKejiNTMTgtR135MPRpxRFwv194HSxLlXG2iSu UeIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hM+JY40z0Sp//jmnsAggmvbu6S59VsvwNNKMeBMBEXU=; b=rL0G7GpFmIDMRMQkJjLABYXobrqxrgQDjtyC9mKxFfOrF8/lfiStk9vNXONuAPgktx HIU8D27SSjbOUoHShS2P8hggvlOd6zqCEc/OXVHA/BJdo2X9ts6djSw8K3sr83rCEYr7 G7QEpSV9RlkSr0DQw5URCXkdflkfabhfSlutUo2j9wS2ic1ejJVAK2JS1oBHs7vC8EdC qhP93VQgO8r185Q4xstaC7UFI+nKj12AYujLoqdWIO5OE5/LKOzDW8jC26fufC72ewbK o/fiuzZo8Vh6TIYdijDZwhq8p9VqoWMn7VDknDTIFoRKpCv/7LMQo51N5602nNMBPEDJ dAzQ== X-Gm-Message-State: AJIora+wEha8n/zIZnGqDhpawmx876lXLN3DQ2ceMrKiWLPWGmsjeZeR xutZLaX8AAbdJ/UjJAvwl+mAnQ== X-Google-Smtp-Source: AGRyM1vyf7Ta5X4sQIFo//kPj8q+JxWhC4AY9zTPh0zpG5Z+plq8k2bUmx9cnguDqySbpnG2Qzilsg== X-Received: by 2002:a05:6870:c698:b0:de:8a16:c37 with SMTP id cv24-20020a056870c69800b000de8a160c37mr5604647oab.191.1655301598709; Wed, 15 Jun 2022 06:59:58 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 06:59:58 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH 08/10] drm: selftest: convert drm_framebuffer selftest to KUnit Date: Wed, 15 Jun 2022 10:58:22 -0300 Message-Id: <20220615135824.15522-9-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM framebuffer selftest to the KUnit API. Signed-off-by: Ma=C3=ADra Canal Reported-by: kernel test robot Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 5 +-- .../gpu/drm/selftests/drm_modeset_selftests.h | 9 ------ .../drm/selftests/test-drm_modeset_common.c | 32 ------------------- .../drm/selftests/test-drm_modeset_common.h | 21 ------------ drivers/gpu/drm/tests/Kconfig | 12 +++++++ drivers/gpu/drm/tests/Makefile | 1 + .../test-drm_framebuffer.c | 25 ++++++++++----- 7 files changed, 31 insertions(+), 74 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h rename drivers/gpu/drm/{selftests =3D> tests}/test-drm_framebuffer.c (96%) diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index 1539f55db9a7..f7db628b60cb 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,5 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -test-drm_modeset-y :=3D test-drm_modeset_common.o test-drm_framebuffer.o - -obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_modeset.o \ - test-drm_buddy.o +obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_buddy.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gp= u/drm/selftests/drm_modeset_selftests.h deleted file mode 100644 index 40a29b8cf386..000000000000 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* List each unit test as selftest(name, function) - * - * The name is used as both an enum and expanded as igt__name to create - * a module parameter. It must be unique and legal for a C identifier. - * - * Tests are executed in order by igt/drm_selftests_helper - */ -selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.c b/drivers/= gpu/drm/selftests/test-drm_modeset_common.c deleted file mode 100644 index 2a7f93774006..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Common file for modeset selftests. - */ - -#include - -#include "test-drm_modeset_common.h" - -#define TESTS "drm_modeset_selftests.h" -#include "drm_selftest.h" - -#include "drm_selftest.c" - -static int __init test_drm_modeset_init(void) -{ - int err; - - err =3D run_selftests(selftests, ARRAY_SIZE(selftests), NULL); - - return err > 0 ? 0 : err; -} - -static void __exit test_drm_modeset_exit(void) -{ -} - -module_init(test_drm_modeset_init); -module_exit(test_drm_modeset_exit); - -MODULE_AUTHOR("Intel Corporation"); -MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/= gpu/drm/selftests/test-drm_modeset_common.h deleted file mode 100644 index 3feb2fea1a6b..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef __TEST_DRM_MODESET_COMMON_H__ -#define __TEST_DRM_MODESET_COMMON_H__ - -#include -#include - -#define FAIL(test, msg, ...) \ - do { \ - if (test) { \ - pr_err("%s/%u: " msg, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ - return -EINVAL; \ - } \ - } while (0) - -#define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") - -int igt_check_drm_framebuffer_create(void *ignored); - -#endif diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index eea0783f981d..de44385f217e 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -86,4 +86,16 @@ config DRM_DP_MST_HELPER_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_FRAMEBUFFER_KUNIT_TEST + tristate "KUnit tests for DRM framebuffer" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + default y if DRM_KUNIT_TEST + help + This option provides KUnit modules that can be used to run + various selftests on parts of the DRM framebuffer API. This + option is not useful for distributions or general kernels, but only + for kernel developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 735ca8e4c446..d802ca0f1544 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_DRM_RECT_KUNIT_TEST) +=3D test-drm_rect.o obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) +=3D test-drm_format.o obj-$(CONFIG_DRM_PLANE_HELPER_KUNIT_TEST) +=3D test-drm_plane_helper.o obj-$(CONFIG_DRM_DP_MST_HELPER_KUNIT_TEST) +=3D test-drm_dp_mst_helper.o +obj-$(CONFIG_DRM_FRAMEBUFFER_KUNIT_TEST) +=3D test-drm_framebuffer.o diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c b/drivers/gpu= /drm/tests/test-drm_framebuffer.c similarity index 96% rename from drivers/gpu/drm/selftests/test-drm_framebuffer.c rename to drivers/gpu/drm/tests/test-drm_framebuffer.c index f6d66285c5fc..753e161ad57f 100644 --- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c +++ b/drivers/gpu/drm/tests/test-drm_framebuffer.c @@ -3,8 +3,7 @@ * Test cases for the drm_framebuffer functions */ =20 -#include - +#include #include #include #include @@ -12,8 +11,6 @@ =20 #include "../drm_crtc_internal.h" =20 -#include "test-drm_modeset_common.h" - #define MIN_WIDTH 4 #define MAX_WIDTH 4096 #define MIN_HEIGHT 4 @@ -336,15 +333,27 @@ static int execute_drm_mode_fb_cmd2(struct drm_mode_f= b_cmd2 *r) return buffer_created; } =20 -int igt_check_drm_framebuffer_create(void *ignored) +static void igt_check_drm_framebuffer_create(struct kunit *test) { int i =3D 0; =20 for (i =3D 0; i < ARRAY_SIZE(createbuffer_tests); i++) { - FAIL(createbuffer_tests[i].buffer_created !=3D + KUNIT_EXPECT_EQ_MSG(test, createbuffer_tests[i].buffer_created, execute_drm_mode_fb_cmd2(&createbuffer_tests[i].cmd), "Test %d: \"%s\" failed\n", i, createbuffer_tests[i].name); } - - return 0; } + +static struct kunit_case drm_framebuffer_tests[] =3D { + KUNIT_CASE(igt_check_drm_framebuffer_create), + { } +}; + +static struct kunit_suite drm_framebuffer_test_suite =3D { + .name =3D "drm_framebuffer_tests", + .test_cases =3D drm_framebuffer_tests, +}; + +kunit_test_suite(drm_framebuffer_test_suite); + +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D56B9C433EF for ; Wed, 15 Jun 2022 14:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355723AbiFOOAp (ORCPT ); Wed, 15 Jun 2022 10:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355629AbiFOOAZ (ORCPT ); Wed, 15 Jun 2022 10:00:25 -0400 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A50B47AF5 for ; Wed, 15 Jun 2022 07:00:06 -0700 (PDT) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-fe539f9afbso16580917fac.5 for ; Wed, 15 Jun 2022 07:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8yv61sauJajXoaBuee9c1zbGBJhUL7kPVgP/LwHr7y0=; b=Mc0neaTSXLu96iwKmQhgaDclyfuNSl7Ud9kjUnBY0VwSbTCb8CpvZ5rD0wDTM+XbW9 4zq5VaDf5vFYkBWKKg6uuz2uf1cQCnSOgO2IDrkTUh83dqNLyei0tWPsCADcpxIUNRsI nV5TzvWTM/i4o8fJVDTy9Boq5ChVJcDIPR0WgqXwUnjGQ4T9aVrnqVwzsFzwaQ5ksnTJ 8mjfuC4hYPkZaUbLw4bDT9YkU+CD12Qv2v9WAXPj0iplf7vRhZYZCL1KLmb1ZbOsxQPa fAobBXw0gqQUwA5s3mkyv4twJO7BvBm9iwIcesoBAJVxhjBiL5P38T63lulpPaj3QF5I 293g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8yv61sauJajXoaBuee9c1zbGBJhUL7kPVgP/LwHr7y0=; b=DMZJJ115PJ2qRS5OyEQcViubc+SnGPMnDBOMyVLgagEt1JvIHQvTG6DbXyt2YFwrwX 3sGQfVCqedbg4FhMUeKe4HDopq2yquyzUFrR+b2LL5zVrDKie+cH3ZlaEvfxEgwV/dhf XjV/Y1LOSdQghDwH82UgQPJreyqY9RNNYmRKzdx+oFZxuFz3JHLl1Gngco14DSkIV7Nx jFFRFU0MWh6JLdanOTj/e2fwqYXKR4vJgBIQW3WPep6ZXFI5ld4/xm3LRCJT5ykrwr0R pKlSODdlmzn83I47IpTzZj1Wf86UDy0JVGiT/7LN123dXbMakzoDJZ0MOwz23MzfabnC TD3g== X-Gm-Message-State: AJIora+uf3Tv2Z4Gq6SIL0kgMFA52CUiTAPknpXQy5z+bwshMhmHlfy/ Lz+nF4appQg+mNBiGbnBMKDS2A== X-Google-Smtp-Source: AGRyM1vPWvFxVmggWkk1YCwWjYSeI53rphkWlvmY6c37Zb+13DUq+1xk5Z8Lr9m5hqYZz8qadNRQkg== X-Received: by 2002:a05:6870:c1cd:b0:fe:1295:6e34 with SMTP id i13-20020a056870c1cd00b000fe12956e34mr5353309oad.137.1655301604757; Wed, 15 Jun 2022 07:00:04 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.06.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 07:00:04 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH 09/10] drm: selftest: convert drm_buddy selftest to KUnit Date: Wed, 15 Jun 2022 10:58:23 -0300 Message-Id: <20220615135824.15522-10-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Considering the current adoption of the KUnit framework, convert the DRM buddy selftest to the KUnit API. Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/selftests/Makefile | 2 +- .../gpu/drm/selftests/drm_buddy_selftests.h | 15 - drivers/gpu/drm/selftests/test-drm_buddy.c | 994 ------------------ drivers/gpu/drm/tests/Kconfig | 15 + drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/test-drm_buddy.c | 748 +++++++++++++ 6 files changed, 765 insertions(+), 1010 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h delete mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c create mode 100644 drivers/gpu/drm/tests/test-drm_buddy.c diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile index f7db628b60cb..a4ebecb8146b 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o test-drm_buddy.o +obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o diff --git a/drivers/gpu/drm/selftests/drm_buddy_selftests.h b/drivers/gpu/= drm/selftests/drm_buddy_selftests.h deleted file mode 100644 index 455b756c4ae5..000000000000 --- a/drivers/gpu/drm/selftests/drm_buddy_selftests.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* List each unit test as selftest(name, function) - * - * The name is used as both an enum and expanded as igt__name to create - * a module parameter. It must be unique and legal for a C identifier. - * - * Tests are executed in order by igt/drm_buddy - */ -selftest(sanitycheck, igt_sanitycheck) /* keep first (selfcheck for igt) */ -selftest(buddy_alloc_limit, igt_buddy_alloc_limit) -selftest(buddy_alloc_range, igt_buddy_alloc_range) -selftest(buddy_alloc_optimistic, igt_buddy_alloc_optimistic) -selftest(buddy_alloc_pessimistic, igt_buddy_alloc_pessimistic) -selftest(buddy_alloc_smoke, igt_buddy_alloc_smoke) -selftest(buddy_alloc_pathological, igt_buddy_alloc_pathological) diff --git a/drivers/gpu/drm/selftests/test-drm_buddy.c b/drivers/gpu/drm/s= elftests/test-drm_buddy.c deleted file mode 100644 index aca0c491040f..000000000000 --- a/drivers/gpu/drm/selftests/test-drm_buddy.c +++ /dev/null @@ -1,994 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright =C2=A9 2019 Intel Corporation - */ - -#define pr_fmt(fmt) "drm_buddy: " fmt - -#include -#include -#include - -#include - -#include "../lib/drm_random.h" - -#define TESTS "drm_buddy_selftests.h" -#include "drm_selftest.h" - -#define IGT_TIMEOUT(name__) \ - unsigned long name__ =3D jiffies + MAX_SCHEDULE_TIMEOUT - -static unsigned int random_seed; - -static inline u64 get_size(int order, u64 chunk_size) -{ - return (1 << order) * chunk_size; -} - -__printf(2, 3) -static bool __igt_timeout(unsigned long timeout, const char *fmt, ...) -{ - va_list va; - - if (!signal_pending(current)) { - cond_resched(); - if (time_before(jiffies, timeout)) - return false; - } - - if (fmt) { - va_start(va, fmt); - vprintk(fmt, va); - va_end(va); - } - - return true; -} - -static inline const char *yesno(bool v) -{ - return v ? "yes" : "no"; -} - -static void __igt_dump_block(struct drm_buddy *mm, - struct drm_buddy_block *block, - bool buddy) -{ - pr_err("block info: header=3D%llx, state=3D%u, order=3D%d, offset=3D%llx = size=3D%llx root=3D%s buddy=3D%s\n", - block->header, - drm_buddy_block_state(block), - drm_buddy_block_order(block), - drm_buddy_block_offset(block), - drm_buddy_block_size(mm, block), - yesno(!block->parent), - yesno(buddy)); -} - -static void igt_dump_block(struct drm_buddy *mm, - struct drm_buddy_block *block) -{ - struct drm_buddy_block *buddy; - - __igt_dump_block(mm, block, false); - - buddy =3D drm_get_buddy(block); - if (buddy) - __igt_dump_block(mm, buddy, true); -} - -static int igt_check_block(struct drm_buddy *mm, - struct drm_buddy_block *block) -{ - struct drm_buddy_block *buddy; - unsigned int block_state; - u64 block_size; - u64 offset; - int err =3D 0; - - block_state =3D drm_buddy_block_state(block); - - if (block_state !=3D DRM_BUDDY_ALLOCATED && - block_state !=3D DRM_BUDDY_FREE && - block_state !=3D DRM_BUDDY_SPLIT) { - pr_err("block state mismatch\n"); - err =3D -EINVAL; - } - - block_size =3D drm_buddy_block_size(mm, block); - offset =3D drm_buddy_block_offset(block); - - if (block_size < mm->chunk_size) { - pr_err("block size smaller than min size\n"); - err =3D -EINVAL; - } - - if (!is_power_of_2(block_size)) { - pr_err("block size not power of two\n"); - err =3D -EINVAL; - } - - if (!IS_ALIGNED(block_size, mm->chunk_size)) { - pr_err("block size not aligned to min size\n"); - err =3D -EINVAL; - } - - if (!IS_ALIGNED(offset, mm->chunk_size)) { - pr_err("block offset not aligned to min size\n"); - err =3D -EINVAL; - } - - if (!IS_ALIGNED(offset, block_size)) { - pr_err("block offset not aligned to block size\n"); - err =3D -EINVAL; - } - - buddy =3D drm_get_buddy(block); - - if (!buddy && block->parent) { - pr_err("buddy has gone fishing\n"); - err =3D -EINVAL; - } - - if (buddy) { - if (drm_buddy_block_offset(buddy) !=3D (offset ^ block_size)) { - pr_err("buddy has wrong offset\n"); - err =3D -EINVAL; - } - - if (drm_buddy_block_size(mm, buddy) !=3D block_size) { - pr_err("buddy size mismatch\n"); - err =3D -EINVAL; - } - - if (drm_buddy_block_state(buddy) =3D=3D block_state && - block_state =3D=3D DRM_BUDDY_FREE) { - pr_err("block and its buddy are free\n"); - err =3D -EINVAL; - } - } - - return err; -} - -static int igt_check_blocks(struct drm_buddy *mm, - struct list_head *blocks, - u64 expected_size, - bool is_contiguous) -{ - struct drm_buddy_block *block; - struct drm_buddy_block *prev; - u64 total; - int err =3D 0; - - block =3D NULL; - prev =3D NULL; - total =3D 0; - - list_for_each_entry(block, blocks, link) { - err =3D igt_check_block(mm, block); - - if (!drm_buddy_block_is_allocated(block)) { - pr_err("block not allocated\n"), - err =3D -EINVAL; - } - - if (is_contiguous && prev) { - u64 prev_block_size; - u64 prev_offset; - u64 offset; - - prev_offset =3D drm_buddy_block_offset(prev); - prev_block_size =3D drm_buddy_block_size(mm, prev); - offset =3D drm_buddy_block_offset(block); - - if (offset !=3D (prev_offset + prev_block_size)) { - pr_err("block offset mismatch\n"); - err =3D -EINVAL; - } - } - - if (err) - break; - - total +=3D drm_buddy_block_size(mm, block); - prev =3D block; - } - - if (!err) { - if (total !=3D expected_size) { - pr_err("size mismatch, expected=3D%llx, found=3D%llx\n", - expected_size, total); - err =3D -EINVAL; - } - return err; - } - - if (prev) { - pr_err("prev block, dump:\n"); - igt_dump_block(mm, prev); - } - - pr_err("bad block, dump:\n"); - igt_dump_block(mm, block); - - return err; -} - -static int igt_check_mm(struct drm_buddy *mm) -{ - struct drm_buddy_block *root; - struct drm_buddy_block *prev; - unsigned int i; - u64 total; - int err =3D 0; - - if (!mm->n_roots) { - pr_err("n_roots is zero\n"); - return -EINVAL; - } - - if (mm->n_roots !=3D hweight64(mm->size)) { - pr_err("n_roots mismatch, n_roots=3D%u, expected=3D%lu\n", - mm->n_roots, hweight64(mm->size)); - return -EINVAL; - } - - root =3D NULL; - prev =3D NULL; - total =3D 0; - - for (i =3D 0; i < mm->n_roots; ++i) { - struct drm_buddy_block *block; - unsigned int order; - - root =3D mm->roots[i]; - if (!root) { - pr_err("root(%u) is NULL\n", i); - err =3D -EINVAL; - break; - } - - err =3D igt_check_block(mm, root); - - if (!drm_buddy_block_is_free(root)) { - pr_err("root not free\n"); - err =3D -EINVAL; - } - - order =3D drm_buddy_block_order(root); - - if (!i) { - if (order !=3D mm->max_order) { - pr_err("max order root missing\n"); - err =3D -EINVAL; - } - } - - if (prev) { - u64 prev_block_size; - u64 prev_offset; - u64 offset; - - prev_offset =3D drm_buddy_block_offset(prev); - prev_block_size =3D drm_buddy_block_size(mm, prev); - offset =3D drm_buddy_block_offset(root); - - if (offset !=3D (prev_offset + prev_block_size)) { - pr_err("root offset mismatch\n"); - err =3D -EINVAL; - } - } - - block =3D list_first_entry_or_null(&mm->free_list[order], - struct drm_buddy_block, - link); - if (block !=3D root) { - pr_err("root mismatch at order=3D%u\n", order); - err =3D -EINVAL; - } - - if (err) - break; - - prev =3D root; - total +=3D drm_buddy_block_size(mm, root); - } - - if (!err) { - if (total !=3D mm->size) { - pr_err("expected mm size=3D%llx, found=3D%llx\n", mm->size, - total); - err =3D -EINVAL; - } - return err; - } - - if (prev) { - pr_err("prev root(%u), dump:\n", i - 1); - igt_dump_block(mm, prev); - } - - if (root) { - pr_err("bad root(%u), dump:\n", i); - igt_dump_block(mm, root); - } - - return err; -} - -static void igt_mm_config(u64 *size, u64 *chunk_size) -{ - DRM_RND_STATE(prng, random_seed); - u32 s, ms; - - /* Nothing fancy, just try to get an interesting bit pattern */ - - prandom_seed_state(&prng, random_seed); - - /* Let size be a random number of pages up to 8 GB (2M pages) */ - s =3D 1 + drm_prandom_u32_max_state((BIT(33 - 12)) - 1, &prng); - /* Let the chunk size be a random power of 2 less than size */ - ms =3D BIT(drm_prandom_u32_max_state(ilog2(s), &prng)); - /* Round size down to the chunk size */ - s &=3D -ms; - - /* Convert from pages to bytes */ - *chunk_size =3D (u64)ms << 12; - *size =3D (u64)s << 12; -} - -static int igt_buddy_alloc_pathological(void *arg) -{ - u64 mm_size, size, min_page_size, start =3D 0; - struct drm_buddy_block *block; - const int max_order =3D 3; - unsigned long flags =3D 0; - int order, top, err; - struct drm_buddy mm; - LIST_HEAD(blocks); - LIST_HEAD(holes); - LIST_HEAD(tmp); - - /* - * Create a pot-sized mm, then allocate one of each possible - * order within. This should leave the mm with exactly one - * page left. Free the largest block, then whittle down again. - * Eventually we will have a fully 50% fragmented mm. - */ - - mm_size =3D PAGE_SIZE << max_order; - err =3D drm_buddy_init(&mm, mm_size, PAGE_SIZE); - if (err) { - pr_err("buddy_init failed(%d)\n", err); - return err; - } - BUG_ON(mm.max_order !=3D max_order); - - for (top =3D max_order; top; top--) { - /* Make room by freeing the largest allocated block */ - block =3D list_first_entry_or_null(&blocks, typeof(*block), link); - if (block) { - list_del(&block->link); - drm_buddy_free_block(&mm, block); - } - - for (order =3D top; order--; ) { - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, - min_page_size, &tmp, flags); - if (err) { - pr_info("buddy_alloc hit -ENOMEM with order=3D%d, top=3D%d\n", - order, top); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - } - - /* There should be one final page for this sub-allocation */ - size =3D min_page_size =3D get_size(0, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (err) { - pr_info("buddy_alloc hit -ENOMEM for hole\n"); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &holes); - - size =3D min_page_size =3D get_size(top, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (!err) { - pr_info("buddy_alloc unexpectedly succeeded at top-order %d/%d, it shou= ld be full!", - top, max_order); - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - err =3D -EINVAL; - goto err; - } - } - - drm_buddy_free_list(&mm, &holes); - - /* Nothing larger than blocks of chunk_size now available */ - for (order =3D 1; order <=3D max_order; order++) { - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (!err) { - pr_info("buddy_alloc unexpectedly succeeded at order %d, it should be f= ull!", - order); - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - err =3D -EINVAL; - goto err; - } - } - - if (err) - err =3D 0; - -err: - list_splice_tail(&holes, &blocks); - drm_buddy_free_list(&mm, &blocks); - drm_buddy_fini(&mm); - return err; -} - -static int igt_buddy_alloc_smoke(void *arg) -{ - u64 mm_size, min_page_size, chunk_size, start =3D 0; - unsigned long flags =3D 0; - struct drm_buddy mm; - int *order; - int err, i; - - DRM_RND_STATE(prng, random_seed); - IGT_TIMEOUT(end_time); - - igt_mm_config(&mm_size, &chunk_size); - - err =3D drm_buddy_init(&mm, mm_size, chunk_size); - if (err) { - pr_err("buddy_init failed(%d)\n", err); - return err; - } - - order =3D drm_random_order(mm.max_order + 1, &prng); - if (!order) { - err =3D -ENOMEM; - goto out_fini; - } - - for (i =3D 0; i <=3D mm.max_order; ++i) { - struct drm_buddy_block *block; - int max_order =3D order[i]; - bool timeout =3D false; - LIST_HEAD(blocks); - u64 total, size; - LIST_HEAD(tmp); - int order; - - err =3D igt_check_mm(&mm); - if (err) { - pr_err("pre-mm check failed, abort\n"); - break; - } - - order =3D max_order; - total =3D 0; - - do { -retry: - size =3D min_page_size =3D get_size(order, chunk_size); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, - min_page_size, &tmp, flags); - if (err) { - if (err =3D=3D -ENOMEM) { - pr_info("buddy_alloc hit -ENOMEM with order=3D%d\n", - order); - } else { - if (order--) { - err =3D 0; - goto retry; - } - - pr_err("buddy_alloc with order=3D%d failed(%d)\n", - order, err); - } - - break; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - break; - } - - list_move_tail(&block->link, &blocks); - - if (drm_buddy_block_order(block) !=3D order) { - pr_err("buddy_alloc order mismatch\n"); - err =3D -EINVAL; - break; - } - - total +=3D drm_buddy_block_size(&mm, block); - - if (__igt_timeout(end_time, NULL)) { - timeout =3D true; - break; - } - } while (total < mm.size); - - if (!err) - err =3D igt_check_blocks(&mm, &blocks, total, false); - - drm_buddy_free_list(&mm, &blocks); - - if (!err) { - err =3D igt_check_mm(&mm); - if (err) - pr_err("post-mm check failed\n"); - } - - if (err || timeout) - break; - - cond_resched(); - } - - if (err =3D=3D -ENOMEM) - err =3D 0; - - kfree(order); -out_fini: - drm_buddy_fini(&mm); - - return err; -} - -static int igt_buddy_alloc_pessimistic(void *arg) -{ - u64 mm_size, size, min_page_size, start =3D 0; - struct drm_buddy_block *block, *bn; - const unsigned int max_order =3D 16; - unsigned long flags =3D 0; - struct drm_buddy mm; - unsigned int order; - LIST_HEAD(blocks); - LIST_HEAD(tmp); - int err; - - /* - * Create a pot-sized mm, then allocate one of each possible - * order within. This should leave the mm with exactly one - * page left. - */ - - mm_size =3D PAGE_SIZE << max_order; - err =3D drm_buddy_init(&mm, mm_size, PAGE_SIZE); - if (err) { - pr_err("buddy_init failed(%d)\n", err); - return err; - } - BUG_ON(mm.max_order !=3D max_order); - - for (order =3D 0; order < max_order; order++) { - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (err) { - pr_info("buddy_alloc hit -ENOMEM with order=3D%d\n", - order); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - } - - /* And now the last remaining block available */ - size =3D min_page_size =3D get_size(0, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size, = &tmp, flags); - if (err) { - pr_info("buddy_alloc hit -ENOMEM on final alloc\n"); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - - /* Should be completely full! */ - for (order =3D max_order; order--; ) { - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (!err) { - pr_info("buddy_alloc unexpectedly succeeded at order %d, it should be f= ull!", - order); - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - err =3D -EINVAL; - goto err; - } - } - - block =3D list_last_entry(&blocks, typeof(*block), link); - list_del(&block->link); - drm_buddy_free_block(&mm, block); - - /* As we free in increasing size, we make available larger blocks */ - order =3D 1; - list_for_each_entry_safe(block, bn, &blocks, link) { - list_del(&block->link); - drm_buddy_free_block(&mm, block); - - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (err) { - pr_info("buddy_alloc (realloc) hit -ENOMEM with order=3D%d\n", - order); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_del(&block->link); - drm_buddy_free_block(&mm, block); - order++; - } - - /* To confirm, now the whole mm should be available */ - size =3D min_page_size =3D get_size(max_order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size, = &tmp, flags); - if (err) { - pr_info("buddy_alloc (realloc) hit -ENOMEM with order=3D%d\n", - max_order); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_del(&block->link); - drm_buddy_free_block(&mm, block); - -err: - drm_buddy_free_list(&mm, &blocks); - drm_buddy_fini(&mm); - return err; -} - -static int igt_buddy_alloc_optimistic(void *arg) -{ - u64 mm_size, size, min_page_size, start =3D 0; - struct drm_buddy_block *block; - unsigned long flags =3D 0; - const int max_order =3D 16; - struct drm_buddy mm; - LIST_HEAD(blocks); - LIST_HEAD(tmp); - int order, err; - - /* - * Create a mm with one block of each order available, and - * try to allocate them all. - */ - - mm_size =3D PAGE_SIZE * ((1 << (max_order + 1)) - 1); - err =3D drm_buddy_init(&mm, - mm_size, - PAGE_SIZE); - if (err) { - pr_err("buddy_init failed(%d)\n", err); - return err; - } - - BUG_ON(mm.max_order !=3D max_order); - - for (order =3D 0; order <=3D max_order; order++) { - size =3D min_page_size =3D get_size(order, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size,= &tmp, flags); - if (err) { - pr_info("buddy_alloc hit -ENOMEM with order=3D%d\n", - order); - goto err; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - } - - /* Should be completely full! */ - size =3D min_page_size =3D get_size(0, PAGE_SIZE); - err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, min_page_size, = &tmp, flags); - if (!err) { - pr_info("buddy_alloc unexpectedly succeeded, it should be full!"); - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_blocks has no blocks\n"); - err =3D -EINVAL; - goto err; - } - - list_move_tail(&block->link, &blocks); - err =3D -EINVAL; - goto err; - } else { - err =3D 0; - } - -err: - drm_buddy_free_list(&mm, &blocks); - drm_buddy_fini(&mm); - return err; -} - -static int igt_buddy_alloc_range(void *arg) -{ - unsigned long flags =3D DRM_BUDDY_RANGE_ALLOCATION; - u64 offset, size, rem, chunk_size, end; - unsigned long page_num; - struct drm_buddy mm; - LIST_HEAD(blocks); - int err; - - igt_mm_config(&size, &chunk_size); - - err =3D drm_buddy_init(&mm, size, chunk_size); - if (err) { - pr_err("buddy_init failed(%d)\n", err); - return err; - } - - err =3D igt_check_mm(&mm); - if (err) { - pr_err("pre-mm check failed, abort, abort, abort!\n"); - goto err_fini; - } - - rem =3D mm.size; - offset =3D 0; - - for_each_prime_number_from(page_num, 1, ULONG_MAX - 1) { - struct drm_buddy_block *block; - LIST_HEAD(tmp); - - size =3D min(page_num * mm.chunk_size, rem); - end =3D offset + size; - - err =3D drm_buddy_alloc_blocks(&mm, offset, end, size, mm.chunk_size, &t= mp, flags); - if (err) { - if (err =3D=3D -ENOMEM) { - pr_info("alloc_range hit -ENOMEM with size=3D%llx\n", - size); - } else { - pr_err("alloc_range with offset=3D%llx, size=3D%llx failed(%d)\n", - offset, size, err); - } - - break; - } - - block =3D list_first_entry_or_null(&tmp, - struct drm_buddy_block, - link); - if (!block) { - pr_err("alloc_range has no blocks\n"); - err =3D -EINVAL; - break; - } - - if (drm_buddy_block_offset(block) !=3D offset) { - pr_err("alloc_range start offset mismatch, found=3D%llx, expected=3D%ll= x\n", - drm_buddy_block_offset(block), offset); - err =3D -EINVAL; - } - - if (!err) - err =3D igt_check_blocks(&mm, &tmp, size, true); - - list_splice_tail(&tmp, &blocks); - - if (err) - break; - - offset +=3D size; - - rem -=3D size; - if (!rem) - break; - - cond_resched(); - } - - if (err =3D=3D -ENOMEM) - err =3D 0; - - drm_buddy_free_list(&mm, &blocks); - - if (!err) { - err =3D igt_check_mm(&mm); - if (err) - pr_err("post-mm check failed\n"); - } - -err_fini: - drm_buddy_fini(&mm); - - return err; -} - -static int igt_buddy_alloc_limit(void *arg) -{ - u64 size =3D U64_MAX, start =3D 0; - struct drm_buddy_block *block; - unsigned long flags =3D 0; - LIST_HEAD(allocated); - struct drm_buddy mm; - int err; - - err =3D drm_buddy_init(&mm, size, PAGE_SIZE); - if (err) - return err; - - if (mm.max_order !=3D DRM_BUDDY_MAX_ORDER) { - pr_err("mm.max_order(%d) !=3D %d\n", - mm.max_order, DRM_BUDDY_MAX_ORDER); - err =3D -EINVAL; - goto out_fini; - } - - size =3D mm.chunk_size << mm.max_order; - err =3D drm_buddy_alloc_blocks(&mm, start, size, size, - PAGE_SIZE, &allocated, flags); - - if (unlikely(err)) - goto out_free; - - block =3D list_first_entry_or_null(&allocated, - struct drm_buddy_block, - link); - - if (!block) { - err =3D -EINVAL; - goto out_fini; - } - - if (drm_buddy_block_order(block) !=3D mm.max_order) { - pr_err("block order(%d) !=3D %d\n", - drm_buddy_block_order(block), mm.max_order); - err =3D -EINVAL; - goto out_free; - } - - if (drm_buddy_block_size(&mm, block) !=3D - BIT_ULL(mm.max_order) * PAGE_SIZE) { - pr_err("block size(%llu) !=3D %llu\n", - drm_buddy_block_size(&mm, block), - BIT_ULL(mm.max_order) * PAGE_SIZE); - err =3D -EINVAL; - goto out_free; - } - -out_free: - drm_buddy_free_list(&mm, &allocated); -out_fini: - drm_buddy_fini(&mm); - return err; -} - -static int igt_sanitycheck(void *ignored) -{ - pr_info("%s - ok!\n", __func__); - return 0; -} - -#include "drm_selftest.c" - -static int __init test_drm_buddy_init(void) -{ - int err; - - while (!random_seed) - random_seed =3D get_random_int(); - - pr_info("Testing DRM buddy manager (struct drm_buddy), with random_seed= =3D0x%x\n", - random_seed); - err =3D run_selftests(selftests, ARRAY_SIZE(selftests), NULL); - - return err > 0 ? 0 : err; -} - -static void __exit test_drm_buddy_exit(void) -{ -} - -module_init(test_drm_buddy_init); -module_exit(test_drm_buddy_exit); - -MODULE_AUTHOR("Intel Corporation"); -MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index de44385f217e..60c4f9801692 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -98,4 +98,19 @@ config DRM_FRAMEBUFFER_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_BUDDY_KUNIT_TEST + tristate "KUnit tests for DRM buddy" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + select PRIME_NUMBERS + select DRM_LIB_RANDOM + select DRM_BUDDY + default y if DRM_KUNIT_TEST + help + This option provides KUnit modules that can be used to run + various selftests on parts of the DRM buddy API. This + option is not useful for distributions or general kernels, but only + for kernel developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index d802ca0f1544..670316fddba1 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) +=3D test-drm_format.o obj-$(CONFIG_DRM_PLANE_HELPER_KUNIT_TEST) +=3D test-drm_plane_helper.o obj-$(CONFIG_DRM_DP_MST_HELPER_KUNIT_TEST) +=3D test-drm_dp_mst_helper.o obj-$(CONFIG_DRM_FRAMEBUFFER_KUNIT_TEST) +=3D test-drm_framebuffer.o +obj-$(CONFIG_DRM_BUDDY_KUNIT_TEST) +=3D test-drm_buddy.o diff --git a/drivers/gpu/drm/tests/test-drm_buddy.c b/drivers/gpu/drm/tests= /test-drm_buddy.c new file mode 100644 index 000000000000..e2aa4175a1d4 --- /dev/null +++ b/drivers/gpu/drm/tests/test-drm_buddy.c @@ -0,0 +1,748 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright =C2=A9 2019 Intel Corporation + */ + +#include +#include +#include + +#include + +#include "../lib/drm_random.h" + +#define IGT_TIMEOUT(name__) = \ + unsigned long name__ =3D jiffies + MAX_SCHEDULE_TIMEOUT + +static unsigned int random_seed; + +static inline u64 get_size(int order, u64 chunk_size) +{ + return (1 << order) * chunk_size; +} + +__printf(2, 3) +static bool __igt_timeout(unsigned long timeout, const char *fmt, ...) +{ + va_list va; + + if (!signal_pending(current)) { + cond_resched(); + if (time_before(jiffies, timeout)) + return false; + } + + if (fmt) { + va_start(va, fmt); + vprintk(fmt, va); + va_end(va); + } + + return true; +} + +static void __igt_dump_block(struct kunit *test, struct drm_buddy *mm, + struct drm_buddy_block *block, bool buddy) +{ + kunit_err(test, "block info: header=3D%llx, state=3D%u, order=3D%d, offse= t=3D%llx size=3D%llx root=3D%d buddy=3D%d\n", + block->header, drm_buddy_block_state(block), + drm_buddy_block_order(block), drm_buddy_block_offset(block), + drm_buddy_block_size(mm, block), !block->parent, buddy); +} + +static void igt_dump_block(struct kunit *test, struct drm_buddy *mm, + struct drm_buddy_block *block) +{ + struct drm_buddy_block *buddy; + + __igt_dump_block(test, mm, block, false); + + buddy =3D drm_get_buddy(block); + if (buddy) + __igt_dump_block(test, mm, buddy, true); +} + +static int igt_check_block(struct kunit *test, struct drm_buddy *mm, + struct drm_buddy_block *block) +{ + struct drm_buddy_block *buddy; + unsigned int block_state; + u64 block_size; + u64 offset; + int err =3D 0; + + block_state =3D drm_buddy_block_state(block); + + if (block_state !=3D DRM_BUDDY_ALLOCATED && + block_state !=3D DRM_BUDDY_FREE && block_state !=3D DRM_BUDDY_SPLIT) { + kunit_err(test, "block state mismatch\n"); + err =3D -EINVAL; + } + + block_size =3D drm_buddy_block_size(mm, block); + offset =3D drm_buddy_block_offset(block); + + if (block_size < mm->chunk_size) { + kunit_err(test, "block size smaller than min size\n"); + err =3D -EINVAL; + } + + if (!is_power_of_2(block_size)) { + kunit_err(test, "block size not power of two\n"); + err =3D -EINVAL; + } + + if (!IS_ALIGNED(block_size, mm->chunk_size)) { + kunit_err(test, "block size not aligned to min size\n"); + err =3D -EINVAL; + } + + if (!IS_ALIGNED(offset, mm->chunk_size)) { + kunit_err(test, "block offset not aligned to min size\n"); + err =3D -EINVAL; + } + + if (!IS_ALIGNED(offset, block_size)) { + kunit_err(test, "block offset not aligned to block size\n"); + err =3D -EINVAL; + } + + buddy =3D drm_get_buddy(block); + + if (!buddy && block->parent) { + kunit_err(test, "buddy has gone fishing\n"); + err =3D -EINVAL; + } + + if (buddy) { + if (drm_buddy_block_offset(buddy) !=3D (offset ^ block_size)) { + kunit_err(test, "buddy has wrong offset\n"); + err =3D -EINVAL; + } + + if (drm_buddy_block_size(mm, buddy) !=3D block_size) { + kunit_err(test, "buddy size mismatch\n"); + err =3D -EINVAL; + } + + if (drm_buddy_block_state(buddy) =3D=3D block_state && + block_state =3D=3D DRM_BUDDY_FREE) { + kunit_err(test, "block and its buddy are free\n"); + err =3D -EINVAL; + } + } + + return err; +} + +static int igt_check_blocks(struct kunit *test, struct drm_buddy *mm, + struct list_head *blocks, u64 expected_size, bool is_contiguous) +{ + struct drm_buddy_block *block; + struct drm_buddy_block *prev; + u64 total; + int err =3D 0; + + block =3D NULL; + prev =3D NULL; + total =3D 0; + + list_for_each_entry(block, blocks, link) { + err =3D igt_check_block(test, mm, block); + + if (!drm_buddy_block_is_allocated(block)) { + kunit_err(test, "block not allocated\n"); + err =3D -EINVAL; + } + + if (is_contiguous && prev) { + u64 prev_block_size; + u64 prev_offset; + u64 offset; + + prev_offset =3D drm_buddy_block_offset(prev); + prev_block_size =3D drm_buddy_block_size(mm, prev); + offset =3D drm_buddy_block_offset(block); + + if (offset !=3D (prev_offset + prev_block_size)) { + kunit_err(test, "block offset mismatch\n"); + err =3D -EINVAL; + } + } + + if (err) + break; + + total +=3D drm_buddy_block_size(mm, block); + prev =3D block; + } + + if (!err) { + if (total !=3D expected_size) { + kunit_err(test, "size mismatch, expected=3D%llx, found=3D%llx\n", + expected_size, total); + err =3D -EINVAL; + } + return err; + } + + if (prev) { + kunit_err(test, "prev block, dump:\n"); + igt_dump_block(test, mm, prev); + } + + kunit_err(test, "bad block, dump:\n"); + igt_dump_block(test, mm, block); + + return err; +} + +static int igt_check_mm(struct kunit *test, struct drm_buddy *mm) +{ + struct drm_buddy_block *root; + struct drm_buddy_block *prev; + unsigned int i; + u64 total; + int err =3D 0; + + if (!mm->n_roots) { + kunit_err(test, "n_roots is zero\n"); + return -EINVAL; + } + + if (mm->n_roots !=3D hweight64(mm->size)) { + kunit_err(test, "n_roots mismatch, n_roots=3D%u, expected=3D%lu\n", + mm->n_roots, hweight64(mm->size)); + return -EINVAL; + } + + root =3D NULL; + prev =3D NULL; + total =3D 0; + + for (i =3D 0; i < mm->n_roots; ++i) { + struct drm_buddy_block *block; + unsigned int order; + + root =3D mm->roots[i]; + if (!root) { + kunit_err(test, "root(%u) is NULL\n", i); + err =3D -EINVAL; + break; + } + + err =3D igt_check_block(test, mm, root); + + if (!drm_buddy_block_is_free(root)) { + kunit_err(test, "root not free\n"); + err =3D -EINVAL; + } + + order =3D drm_buddy_block_order(root); + + if (!i) { + if (order !=3D mm->max_order) { + kunit_err(test, "max order root missing\n"); + err =3D -EINVAL; + } + } + + if (prev) { + u64 prev_block_size; + u64 prev_offset; + u64 offset; + + prev_offset =3D drm_buddy_block_offset(prev); + prev_block_size =3D drm_buddy_block_size(mm, prev); + offset =3D drm_buddy_block_offset(root); + + if (offset !=3D (prev_offset + prev_block_size)) { + kunit_err(test, "root offset mismatch\n"); + err =3D -EINVAL; + } + } + + block =3D list_first_entry_or_null(&mm->free_list[order], + struct drm_buddy_block, link); + if (block !=3D root) { + kunit_err(test, "root mismatch at order=3D%u\n", order); + err =3D -EINVAL; + } + + if (err) + break; + + prev =3D root; + total +=3D drm_buddy_block_size(mm, root); + } + + if (!err) { + if (total !=3D mm->size) { + kunit_err(test, "expected mm size=3D%llx, found=3D%llx\n", + mm->size, total); + err =3D -EINVAL; + } + return err; + } + + if (prev) { + kunit_err(test, "prev root(%u), dump:\n", i - 1); + igt_dump_block(test, mm, prev); + } + + if (root) { + kunit_err(test, "bad root(%u), dump:\n", i); + igt_dump_block(test, mm, root); + } + + return err; +} + +static void igt_mm_config(u64 *size, u64 *chunk_size) +{ + DRM_RND_STATE(prng, random_seed); + u32 s, ms; + + /* Nothing fancy, just try to get an interesting bit pattern */ + + prandom_seed_state(&prng, random_seed); + + /* Let size be a random number of pages up to 8 GB (2M pages) */ + s =3D 1 + drm_prandom_u32_max_state((BIT(33 - 12)) - 1, &prng); + /* Let the chunk size be a random power of 2 less than size */ + ms =3D BIT(drm_prandom_u32_max_state(ilog2(s), &prng)); + /* Round size down to the chunk size */ + s &=3D -ms; + + /* Convert from pages to bytes */ + *chunk_size =3D (u64)ms << 12; + *size =3D (u64)s << 12; +} + +static void igt_buddy_alloc_pathological(struct kunit *test) +{ + u64 mm_size, size, start =3D 0; + struct drm_buddy_block *block; + const int max_order =3D 3; + unsigned long flags =3D 0; + int order, top; + struct drm_buddy mm; + LIST_HEAD(blocks); + LIST_HEAD(holes); + LIST_HEAD(tmp); + + /* + * Create a pot-sized mm, then allocate one of each possible + * order within. This should leave the mm with exactly one + * page left. Free the largest block, then whittle down again. + * Eventually we will have a fully 50% fragmented mm. + */ + + mm_size =3D PAGE_SIZE << max_order; + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_init(&mm, mm_size, PAGE_SIZE), + "buddy_init failed\n"); + + KUNIT_EXPECT_EQ(test, mm.max_order, max_order); + + for (top =3D max_order; top; top--) { + /* Make room by freeing the largest allocated block */ + block =3D list_first_entry_or_null(&blocks, typeof(*block), link); + if (block) { + list_del(&block->link); + drm_buddy_free_block(&mm, block); + } + + for (order =3D top; order--;) { + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, + mm_size, size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM with order=3D%d, top=3D%d\n", + order, top); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &blocks); + } + + /* There should be one final page for this sub-allocation */ + size =3D get_size(0, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM for hole\n"); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &holes); + + size =3D get_size(top, PAGE_SIZE); + KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc unexpectedly succeeded at top-order %d/%d, it should= be full!", + top, max_order); + } + + drm_buddy_free_list(&mm, &holes); + + /* Nothing larger than blocks of chunk_size now available */ + for (order =3D 1; order <=3D max_order; order++) { + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc unexpectedly succeeded at order %d, it should be ful= l!", + order); + } + + list_splice_tail(&holes, &blocks); + drm_buddy_free_list(&mm, &blocks); + drm_buddy_fini(&mm); +} + +static void igt_buddy_alloc_smoke(struct kunit *test) +{ + u64 mm_size, chunk_size, start =3D 0; + unsigned long flags =3D 0; + struct drm_buddy mm; + int *order; + int i; + + DRM_RND_STATE(prng, random_seed); + IGT_TIMEOUT(end_time); + + igt_mm_config(&mm_size, &chunk_size); + + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_init(&mm, mm_size, chunk_size), + "buddy_init failed\n"); + + order =3D drm_random_order(mm.max_order + 1, &prng); + KUNIT_ASSERT_TRUE(test, order); + + for (i =3D 0; i <=3D mm.max_order; ++i) { + struct drm_buddy_block *block; + int max_order =3D order[i]; + bool timeout =3D false; + LIST_HEAD(blocks); + u64 total, size; + LIST_HEAD(tmp); + int order, err; + + KUNIT_ASSERT_FALSE_MSG(test, igt_check_mm(test, &mm), + "pre-mm check failed, abort\n"); + + order =3D max_order; + total =3D 0; + + do { +retry: + size =3D get_size(order, chunk_size); + err =3D drm_buddy_alloc_blocks(&mm, start, mm_size, size, size, &tmp, f= lags); + if (err) { + if (err =3D=3D -ENOMEM) { + KUNIT_FAIL(test, "buddy_alloc hit -ENOMEM with order=3D%d\n", + order); + } else { + if (order--) { + err =3D 0; + goto retry; + } + + KUNIT_FAIL(test, "buddy_alloc with order=3D%d failed\n", order); + } + + break; + } + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &blocks); + KUNIT_EXPECT_EQ_MSG(test, drm_buddy_block_order(block), order, + "buddy_alloc order mismatch\n"); + + total +=3D drm_buddy_block_size(&mm, block); + + if (__igt_timeout(end_time, NULL)) { + timeout =3D true; + break; + } + } while (total < mm.size); + + if (!err) + err =3D igt_check_blocks(test, &mm, &blocks, total, false); + + drm_buddy_free_list(&mm, &blocks); + + if (!err) { + KUNIT_EXPECT_FALSE_MSG(test, igt_check_mm(test, &mm), + "post-mm check failed\n"); + } + + if (err || timeout) + break; + + cond_resched(); + } + + kfree(order); + drm_buddy_fini(&mm); +} + +static void igt_buddy_alloc_pessimistic(struct kunit *test) +{ + u64 mm_size, size, start =3D 0; + struct drm_buddy_block *block, *bn; + const unsigned int max_order =3D 16; + unsigned long flags =3D 0; + struct drm_buddy mm; + unsigned int order; + LIST_HEAD(blocks); + LIST_HEAD(tmp); + + /* + * Create a pot-sized mm, then allocate one of each possible + * order within. This should leave the mm with exactly one + * page left. + */ + + mm_size =3D PAGE_SIZE << max_order; + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_init(&mm, mm_size, PAGE_SIZE), + "buddy_init failed\n"); + + KUNIT_EXPECT_EQ(test, mm.max_order, max_order); + + for (order =3D 0; order < max_order; order++) { + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM with order=3D%d\n", order); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &blocks); + } + + /* And now the last remaining block available */ + size =3D get_size(0, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM on final alloc\n"); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &blocks); + + /* Should be completely full! */ + for (order =3D max_order; order--;) { + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc unexpectedly succeeded, it should be full!"); + } + + block =3D list_last_entry(&blocks, typeof(*block), link); + list_del(&block->link); + drm_buddy_free_block(&mm, block); + + /* As we free in increasing size, we make available larger blocks */ + order =3D 1; + list_for_each_entry_safe(block, bn, &blocks, link) { + list_del(&block->link); + drm_buddy_free_block(&mm, block); + + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM with order=3D%d\n", order); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_del(&block->link); + drm_buddy_free_block(&mm, block); + order++; + } + + /* To confirm, now the whole mm should be available */ + size =3D get_size(max_order, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc (realloc) hit -ENOMEM with order=3D%d\n", max_order); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_del(&block->link); + drm_buddy_free_block(&mm, block); + drm_buddy_free_list(&mm, &blocks); + drm_buddy_fini(&mm); +} + +static void igt_buddy_alloc_optimistic(struct kunit *test) +{ + u64 mm_size, size, start =3D 0; + struct drm_buddy_block *block; + unsigned long flags =3D 0; + const int max_order =3D 16; + struct drm_buddy mm; + LIST_HEAD(blocks); + LIST_HEAD(tmp); + int order; + + /* + * Create a mm with one block of each order available, and + * try to allocate them all. + */ + + mm_size =3D PAGE_SIZE * ((1 << (max_order + 1)) - 1); + + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_init(&mm, mm_size, PAGE_SIZE), + "buddy_init failed\n"); + + KUNIT_EXPECT_EQ(test, mm.max_order, max_order); + + for (order =3D 0; order <=3D max_order; order++) { + size =3D get_size(order, PAGE_SIZE); + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc hit -ENOMEM with order=3D%d\n", order); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_blocks has no blocks\n"); + + list_move_tail(&block->link, &blocks); + } + + /* Should be completely full! */ + size =3D get_size(0, PAGE_SIZE); + KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, start, mm_size, + size, size, &tmp, flags), + "buddy_alloc unexpectedly succeeded, it should be full!"); + + drm_buddy_free_list(&mm, &blocks); + drm_buddy_fini(&mm); +} + +static void igt_buddy_alloc_range(struct kunit *test) +{ + unsigned long flags =3D DRM_BUDDY_RANGE_ALLOCATION; + u64 offset, size, rem, chunk_size, end; + unsigned long page_num; + struct drm_buddy mm; + LIST_HEAD(blocks); + + igt_mm_config(&size, &chunk_size); + + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_init(&mm, size, chunk_size), + "buddy_init failed"); + + KUNIT_ASSERT_FALSE_MSG(test, igt_check_mm(test, &mm), + "pre-mm check failed, abort!"); + + rem =3D mm.size; + offset =3D 0; + + for_each_prime_number_from(page_num, 1, ULONG_MAX - 1) { + struct drm_buddy_block *block; + LIST_HEAD(tmp); + + size =3D min(page_num * mm.chunk_size, rem); + end =3D offset + size; + + KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, offset, end, + size, mm.chunk_size, &tmp, flags), + "alloc_range with offset=3D%llx, size=3D%llx failed\n", + offset, size); + + block =3D list_first_entry_or_null(&tmp, struct drm_buddy_block, link); + KUNIT_ASSERT_TRUE_MSG(test, block, "alloc_range has no blocks\n"); + + KUNIT_ASSERT_EQ_MSG(test, drm_buddy_block_offset(block), offset, + "alloc_range start offset mismatch, found=3D%llx, expected=3D%llx\n= ", + drm_buddy_block_offset(block), offset); + + KUNIT_ASSERT_FALSE(test, igt_check_blocks(test, &mm, &tmp, size, true)); + + list_splice_tail(&tmp, &blocks); + + offset +=3D size; + + rem -=3D size; + if (!rem) + break; + + cond_resched(); + } + + drm_buddy_free_list(&mm, &blocks); + + KUNIT_EXPECT_FALSE_MSG(test, igt_check_mm(test, &mm), "post-mm check fail= ed\n"); + + drm_buddy_fini(&mm); +} + +static void igt_buddy_alloc_limit(struct kunit *test) +{ + u64 size =3D U64_MAX, start =3D 0; + struct drm_buddy_block *block; + unsigned long flags =3D 0; + LIST_HEAD(allocated); + struct drm_buddy mm; + + KUNIT_EXPECT_FALSE(test, drm_buddy_init(&mm, size, PAGE_SIZE)); + + KUNIT_EXPECT_EQ_MSG(test, mm.max_order, DRM_BUDDY_MAX_ORDER, + "mm.max_order(%d) !=3D %d\n", mm.max_order, + DRM_BUDDY_MAX_ORDER); + + size =3D mm.chunk_size << mm.max_order; + KUNIT_EXPECT_FALSE(test, drm_buddy_alloc_blocks(&mm, start, size, size, + PAGE_SIZE, &allocated, flags)); + + block =3D list_first_entry_or_null(&allocated, struct drm_buddy_block, li= nk); + KUNIT_EXPECT_TRUE(test, block); + + KUNIT_EXPECT_EQ_MSG(test, drm_buddy_block_order(block), mm.max_order, + "block order(%d) !=3D %d\n", + drm_buddy_block_order(block), mm.max_order); + + KUNIT_EXPECT_EQ_MSG(test, drm_buddy_block_size(&mm, block), + BIT_ULL(mm.max_order) * PAGE_SIZE, + "block size(%llu) !=3D %llu\n", + drm_buddy_block_size(&mm, block), + BIT_ULL(mm.max_order) * PAGE_SIZE); + + drm_buddy_free_list(&mm, &allocated); + drm_buddy_fini(&mm); +} + +static int drm_buddy_init_test(struct kunit *test) +{ + while (!random_seed) + random_seed =3D get_random_int(); + + return 0; +} + +static struct kunit_case drm_buddy_tests[] =3D { + KUNIT_CASE(igt_buddy_alloc_limit), + KUNIT_CASE(igt_buddy_alloc_range), + KUNIT_CASE(igt_buddy_alloc_optimistic), + KUNIT_CASE(igt_buddy_alloc_pessimistic), + KUNIT_CASE(igt_buddy_alloc_smoke), + KUNIT_CASE(igt_buddy_alloc_pathological), + {} +}; + +static struct kunit_suite drm_buddy_test_suite =3D { + .name =3D "drm_buddy_tests", + .init =3D drm_buddy_init_test, + .test_cases =3D drm_buddy_tests, +}; + +kunit_test_suite(drm_buddy_test_suite); + +MODULE_AUTHOR("Intel Corporation"); +MODULE_LICENSE("GPL"); --=20 2.36.1 From nobody Mon Apr 27 07:53:32 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F3E8C43334 for ; Wed, 15 Jun 2022 14:01:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355775AbiFOOA5 (ORCPT ); Wed, 15 Jun 2022 10:00:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355685AbiFOOAd (ORCPT ); Wed, 15 Jun 2022 10:00:33 -0400 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 280C941601 for ; Wed, 15 Jun 2022 07:00:13 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id 93-20020a9d02e6000000b0060c252ee7a4so8868781otl.13 for ; Wed, 15 Jun 2022 07:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UulhO8y71QH4EnuoJYot2qDwQlYlgRmDOiqdrx2SxD8=; b=M7watJjGWIgfa8T4f1pFCYgktvYrTqymn6IO+zCtIJPhGFFKZxdF/loFkY41sRMGR9 iKmFcUg65O9AOEFvQz2Oed9SxFjsKFJhzwxN/+5CXBZenPZHqQUYQ1MvOGvnXrfAnwLf Al+AhE6+onddGQm+U4H3YPqkW02NAo5fWjATEwP09IhMN5WGiiuemxO4DJxdANK51aGy hnVA4MgJxImH+KbrvhRl5cWJ12c7a1iC2H3BGKeMngysKP6ErJjZpdFALG+6N1O7jXQz YZ4mbGMI43lQtSYNf2QWPLtC2ViBt1p0uReYRuVw3IMzLFnL5le6RMc82RHEoqDP7eSC LzSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UulhO8y71QH4EnuoJYot2qDwQlYlgRmDOiqdrx2SxD8=; b=ZLa2B0vQKnzGVeb6OwpotbdGZ768FGXNxksTbKy64L6MkUwsnYArR5W7r+oPlaOIRy v81CHdFYwwggJpyYO2ZV5zJsPiif+Jtu3cptP4/EnSKKmBUr9DwSSuxuWesXW4p6CmOO on6mKU9CR10PFgfIWlEXS/AroPiiI7pw0Zocmwo/dIadlp9cwe0WuHR6B/Bn8zr1wfO8 BqxCMumGwsw8s9Ukb/t6A1oLR6Ezx7WvKO8klT1qSsHoOdTuI6D81+fL22CiGVcjoKaB K8uswV4xl0xet7LHGkudxSgCYjlspe2lP5/nlDRzU/dEtLq/CL8mHGE6eHXRg+ZSKNN2 m0jQ== X-Gm-Message-State: AOAM530ZSyOBxARFvZTac7TBZgnng621/j/tkpzggeIycsHK3aQarrTM 6JoWYMJgCh1y7vAIPKkiB9SEwQ== X-Google-Smtp-Source: ABdhPJxeaml9Tc/xHb/iUm0RVTMtro5FrcF+2E49Hal/9Nbk4ryDqiLQrZPeGkU6Ym/T1UHsc4vbDA== X-Received: by 2002:a05:6830:31a3:b0:60c:3dd3:708f with SMTP id q3-20020a05683031a300b0060c3dd3708fmr4295843ots.172.1655301611339; Wed, 15 Jun 2022 07:00:11 -0700 (PDT) Received: from fedora.. ([2804:14d:8084:84c6:fe26:c42d:aab9:fa8a]) by smtp.gmail.com with ESMTPSA id u7-20020a056830248700b0060bfebb96e5sm6056928ots.35.2022.06.15.07.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 07:00:10 -0700 (PDT) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, mwen@igalia.com, andrealmeid@riseup.net, Trevor Woerner , leandro.ribeiro@collabora.com, n@nfraprado.net, Daniel Vetter , Shuah Khan , David Airlie , Maxime Ripard , Thomas Zimmermann , michal.winiarski@intel.com, Javier Martinez Canillas , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , David Gow , Daniel Latypov , brendanhiggins@google.com Cc: dri-devel@lists.freedesktop.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, Arthur Grillo , =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH 10/10] drm: selftest: convert drm_mm selftest to KUnit Date: Wed, 15 Jun 2022 10:58:24 -0300 Message-Id: <20220615135824.15522-11-maira.canal@usp.br> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615135824.15522-1-maira.canal@usp.br> References: <20220615135824.15522-1-maira.canal@usp.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arthur Grillo Considering the current adoption of the KUnit framework, convert the DRM mm selftest to the KUnit API. Signed-off-by: Arthur Grillo Signed-off-by: Ma=C3=ADra Canal Tested-by: David Gow --- drivers/gpu/drm/Kconfig | 20 - drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/selftests/Makefile | 2 - drivers/gpu/drm/selftests/drm_mm_selftests.h | 28 - drivers/gpu/drm/selftests/drm_selftest.c | 109 -- drivers/gpu/drm/selftests/drm_selftest.h | 41 - drivers/gpu/drm/tests/Kconfig | 14 + drivers/gpu/drm/tests/Makefile | 1 + .../drm/{selftests =3D> tests}/test-drm_mm.c | 1135 +++++++---------- 9 files changed, 465 insertions(+), 886 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/Makefile delete mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.c delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.h rename drivers/gpu/drm/{selftests =3D> tests}/test-drm_mm.c (58%) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index bd1b5d82c9cf..f1330d091a6e 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -50,26 +50,6 @@ config DRM_DEBUG_MM =20 If in doubt, say "N". =20 -config DRM_DEBUG_SELFTEST - tristate "kselftests for DRM" - depends on DRM - depends on DEBUG_KERNEL - select PRIME_NUMBERS - select DRM_DISPLAY_DP_HELPER - select DRM_DISPLAY_HELPER - select DRM_LIB_RANDOM - select DRM_KMS_HELPER - select DRM_BUDDY - select DRM_EXPORT_FOR_TESTS if m - default n - help - This option provides kernel modules that can be used to run - various selftests on parts of the DRM api. This option is not - useful for distributions or general kernels, but only for kernel - developers working on DRM and associated drivers. - - If in doubt, say "N". - source "drivers/gpu/drm/tests/Kconfig" =20 config DRM_KMS_HELPER diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 0f24aa542be0..8322a740146f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -75,7 +75,6 @@ obj-$(CONFIG_DRM_KMS_HELPER) +=3D drm_kms_helper.o # Drivers and the rest # =20 -obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D selftests/ obj-y +=3D tests/ =20 obj-$(CONFIG_DRM_MIPI_DBI) +=3D drm_mipi_dbi.o diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests= /Makefile deleted file mode 100644 index a4ebecb8146b..000000000000 --- a/drivers/gpu/drm/selftests/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_DRM_DEBUG_SELFTEST) +=3D test-drm_mm.o diff --git a/drivers/gpu/drm/selftests/drm_mm_selftests.h b/drivers/gpu/drm= /selftests/drm_mm_selftests.h deleted file mode 100644 index 8c87c964176b..000000000000 --- a/drivers/gpu/drm/selftests/drm_mm_selftests.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* List each unit test as selftest(name, function) - * - * The name is used as both an enum and expanded as igt__name to create - * a module parameter. It must be unique and legal for a C identifier. - * - * Tests are executed in order by igt/drm_mm - */ -selftest(sanitycheck, igt_sanitycheck) /* keep first (selfcheck for igt) */ -selftest(init, igt_init) -selftest(debug, igt_debug) -selftest(reserve, igt_reserve) -selftest(insert, igt_insert) -selftest(replace, igt_replace) -selftest(insert_range, igt_insert_range) -selftest(align, igt_align) -selftest(frag, igt_frag) -selftest(align32, igt_align32) -selftest(align64, igt_align64) -selftest(evict, igt_evict) -selftest(evict_range, igt_evict_range) -selftest(bottomup, igt_bottomup) -selftest(lowest, igt_lowest) -selftest(topdown, igt_topdown) -selftest(highest, igt_highest) -selftest(color, igt_color) -selftest(color_evict, igt_color_evict) -selftest(color_evict_range, igt_color_evict_range) diff --git a/drivers/gpu/drm/selftests/drm_selftest.c b/drivers/gpu/drm/sel= ftests/drm_selftest.c deleted file mode 100644 index e29ed9faef5b..000000000000 --- a/drivers/gpu/drm/selftests/drm_selftest.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright =C2=A9 2016 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software= "), - * to deal in the Software without restriction, including without limitati= on - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the ne= xt - * paragraph) shall be included in all copies or substantial portions of t= he - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEA= LINGS - * IN THE SOFTWARE. - */ - -#include - -#define selftest(name, func) __idx_##name, -enum { -#include TESTS -}; -#undef selftest - -#define selftest(n, f) [__idx_##n] =3D { .name =3D #n, .func =3D f }, -static struct drm_selftest { - bool enabled; - const char *name; - int (*func)(void *); -} selftests[] =3D { -#include TESTS -}; -#undef selftest - -/* Embed the line number into the parameter name so that we can order test= s */ -#define param(n) __PASTE(igt__, __PASTE(__PASTE(__LINE__, __), n)) -#define selftest_0(n, func, id) \ -module_param_named(id, selftests[__idx_##n].enabled, bool, 0400); -#define selftest(n, func) selftest_0(n, func, param(n)) -#include TESTS -#undef selftest - -static void set_default_test_all(struct drm_selftest *st, unsigned long co= unt) -{ - unsigned long i; - - for (i =3D 0; i < count; i++) - if (st[i].enabled) - return; - - for (i =3D 0; i < count; i++) - st[i].enabled =3D true; -} - -static int run_selftests(struct drm_selftest *st, - unsigned long count, - void *data) -{ - int err =3D 0; - - set_default_test_all(st, count); - - /* Tests are listed in natural order in drm_*_selftests.h */ - for (; count--; st++) { - if (!st->enabled) - continue; - - pr_debug("drm: Running %s\n", st->name); - err =3D st->func(data); - if (err) - break; - } - - if (WARN(err > 0 || err =3D=3D -ENOTTY, - "%s returned %d, conflicting with selftest's magic values!\n", - st->name, err)) - err =3D -1; - - rcu_barrier(); - return err; -} - -static int __maybe_unused -__drm_subtests(const char *caller, - const struct drm_subtest *st, - int count, - void *data) -{ - int err; - - for (; count--; st++) { - pr_debug("Running %s/%s\n", caller, st->name); - err =3D st->func(data); - if (err) { - pr_err("%s: %s failed with error %d\n", - caller, st->name, err); - return err; - } - } - - return 0; -} diff --git a/drivers/gpu/drm/selftests/drm_selftest.h b/drivers/gpu/drm/sel= ftests/drm_selftest.h deleted file mode 100644 index c784ec02ff53..000000000000 --- a/drivers/gpu/drm/selftests/drm_selftest.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright =C2=A9 2016 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software= "), - * to deal in the Software without restriction, including without limitati= on - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the ne= xt - * paragraph) shall be included in all copies or substantial portions of t= he - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEA= LINGS - * IN THE SOFTWARE. - */ - -#ifndef __DRM_SELFTEST_H__ -#define __DRM_SELFTEST_H__ - -struct drm_subtest { - int (*func)(void *data); - const char *name; -}; - -static int __drm_subtests(const char *caller, - const struct drm_subtest *st, - int count, - void *data); -#define drm_subtests(T, data) \ - __drm_subtests(__func__, T, ARRAY_SIZE(T), data) - -#define SUBTEST(x) { x, #x } - -#endif /* __DRM_SELFTEST_H__ */ diff --git a/drivers/gpu/drm/tests/Kconfig b/drivers/gpu/drm/tests/Kconfig index 60c4f9801692..b7de6b6cd73b 100644 --- a/drivers/gpu/drm/tests/Kconfig +++ b/drivers/gpu/drm/tests/Kconfig @@ -113,4 +113,18 @@ config DRM_BUDDY_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_MM_KUNIT_TEST + tristate "KUnit tests for DRM mm" if !DRM_KUNIT_TEST + select DRM_KMS_HELPER + select PRIME_NUMBERS + select DRM_LIB_RANDOM + default y if DRM_KUNIT_TEST + help + This option provides KUnit modules that can be used to run + various selftests on parts of the DRM mm API. This + option is not useful for distributions or general kernels, but only + for kernel developers working on DRM and associated drivers. + + If in doubt, say "N". + endmenu diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 670316fddba1..5140681a5e14 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_DRM_PLANE_HELPER_KUNIT_TEST) +=3D test-drm_pla= ne_helper.o obj-$(CONFIG_DRM_DP_MST_HELPER_KUNIT_TEST) +=3D test-drm_dp_mst_helper.o obj-$(CONFIG_DRM_FRAMEBUFFER_KUNIT_TEST) +=3D test-drm_framebuffer.o obj-$(CONFIG_DRM_BUDDY_KUNIT_TEST) +=3D test-drm_buddy.o +obj-$(CONFIG_DRM_MM_KUNIT_TEST) +=3D test-drm_mm.o diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/test= s/test-drm_mm.c similarity index 58% rename from drivers/gpu/drm/selftests/test-drm_mm.c rename to drivers/gpu/drm/tests/test-drm_mm.c index b768b53c4aee..29d9b5227746 100644 --- a/drivers/gpu/drm/selftests/test-drm_mm.c +++ b/drivers/gpu/drm/tests/test-drm_mm.c @@ -3,9 +3,7 @@ * Test cases for the drm_mm range manager */ =20 -#define pr_fmt(fmt) "drm_mm: " fmt - -#include +#include #include #include #include @@ -16,9 +14,6 @@ =20 #include "../lib/drm_random.h" =20 -#define TESTS "drm_mm_selftests.h" -#include "drm_selftest.h" - static unsigned int random_seed; static unsigned int max_iterations =3D 8192; static unsigned int max_prime =3D 128; @@ -45,13 +40,7 @@ static const struct insert_mode { {} }; =20 -static int igt_sanitycheck(void *ignored) -{ - pr_info("%s - ok!\n", __func__); - return 0; -} - -static bool assert_no_holes(const struct drm_mm *mm) +static bool assert_no_holes(struct kunit *test, const struct drm_mm *mm) { struct drm_mm_node *hole; u64 hole_start, __always_unused hole_end; @@ -61,13 +50,14 @@ static bool assert_no_holes(const struct drm_mm *mm) drm_mm_for_each_hole(hole, mm, hole_start, hole_end) count++; if (count) { - pr_err("Expected to find no holes (after reserve), found %lu instead\n",= count); + KUNIT_FAIL(test, + "Expected to find no holes (after reserve), found %lu instead\n", co= unt); return false; } =20 drm_mm_for_each_node(hole, mm) { if (drm_mm_hole_follows(hole)) { - pr_err("Hole follows node, expected none!\n"); + KUNIT_FAIL(test, "Hole follows node, expected none!\n"); return false; } } @@ -75,7 +65,7 @@ static bool assert_no_holes(const struct drm_mm *mm) return true; } =20 -static bool assert_one_hole(const struct drm_mm *mm, u64 start, u64 end) +static bool assert_one_hole(struct kunit *test, const struct drm_mm *mm, u= 64 start, u64 end) { struct drm_mm_node *hole; u64 hole_start, hole_end; @@ -89,62 +79,62 @@ static bool assert_one_hole(const struct drm_mm *mm, u6= 4 start, u64 end) drm_mm_for_each_hole(hole, mm, hole_start, hole_end) { if (start !=3D hole_start || end !=3D hole_end) { if (ok) - pr_err("empty mm has incorrect hole, found (%llx, %llx), expect (%llx,= %llx)\n", - hole_start, hole_end, - start, end); + KUNIT_FAIL(test, + "empty mm has incorrect hole, found (%llx, %llx), expect (%llx, %l= lx)\n", + hole_start, hole_end, start, end); ok =3D false; } count++; } if (count !=3D 1) { - pr_err("Expected to find one hole, found %lu instead\n", count); + KUNIT_FAIL(test, "Expected to find one hole, found %lu instead\n", count= ); ok =3D false; } =20 return ok; } =20 -static bool assert_continuous(const struct drm_mm *mm, u64 size) +static bool assert_continuous(struct kunit *test, const struct drm_mm *mm,= u64 size) { struct drm_mm_node *node, *check, *found; unsigned long n; u64 addr; =20 - if (!assert_no_holes(mm)) + if (!assert_no_holes(test, mm)) return false; =20 n =3D 0; addr =3D 0; drm_mm_for_each_node(node, mm) { if (node->start !=3D addr) { - pr_err("node[%ld] list out of order, expected %llx found %llx\n", + KUNIT_FAIL(test, "node[%ld] list out of order, expected %llx found %llx= \n", n, addr, node->start); return false; } =20 if (node->size !=3D size) { - pr_err("node[%ld].size incorrect, expected %llx, found %llx\n", + KUNIT_FAIL(test, "node[%ld].size incorrect, expected %llx, found %llx\n= ", n, size, node->size); return false; } =20 if (drm_mm_hole_follows(node)) { - pr_err("node[%ld] is followed by a hole!\n", n); + KUNIT_FAIL(test, "node[%ld] is followed by a hole!\n", n); return false; } =20 found =3D NULL; drm_mm_for_each_node_in_range(check, mm, addr, addr + size) { if (node !=3D check) { - pr_err("lookup return wrong node, expected start %llx, found %llx\n", - node->start, check->start); + KUNIT_FAIL(test, + "lookup return wrong node, expected start %llx, found %llx\n", + node->start, check->start); return false; } found =3D check; } if (!found) { - pr_err("lookup failed for node %llx + %llx\n", - addr, size); + KUNIT_FAIL(test, "lookup failed for node %llx + %llx\n", addr, size); return false; } =20 @@ -166,30 +156,31 @@ static u64 misalignment(struct drm_mm_node *node, u64= alignment) return rem; } =20 -static bool assert_node(struct drm_mm_node *node, struct drm_mm *mm, +static bool assert_node(struct kunit *test, struct drm_mm_node *node, stru= ct drm_mm *mm, u64 size, u64 alignment, unsigned long color) { bool ok =3D true; =20 if (!drm_mm_node_allocated(node) || node->mm !=3D mm) { - pr_err("node not allocated\n"); + KUNIT_FAIL(test, "node not allocated\n"); ok =3D false; } =20 if (node->size !=3D size) { - pr_err("node has wrong size, found %llu, expected %llu\n", + KUNIT_FAIL(test, "node has wrong size, found %llu, expected %llu\n", node->size, size); ok =3D false; } =20 if (misalignment(node, alignment)) { - pr_err("node is misaligned, start %llx rem %llu, expected alignment %llu= \n", - node->start, misalignment(node, alignment), alignment); + KUNIT_FAIL(test, + "node is misaligned, start %llx rem %llu, expected alignment %llu\n", + node->start, misalignment(node, alignment), alignment); ok =3D false; } =20 if (node->color !=3D color) { - pr_err("node has wrong color, found %lu, expected %lu\n", + KUNIT_FAIL(test, "node has wrong color, found %lu, expected %lu\n", node->color, color); ok =3D false; } @@ -197,76 +188,64 @@ static bool assert_node(struct drm_mm_node *node, str= uct drm_mm *mm, return ok; } =20 -#define show_mm(mm) do { \ - struct drm_printer __p =3D drm_debug_printer(__func__); \ - drm_mm_print((mm), &__p); } while (0) - -static int igt_init(void *ignored) +static void igt_mm_init(struct kunit *test) { const unsigned int size =3D 4096; struct drm_mm mm; struct drm_mm_node tmp; - int ret =3D -EINVAL; =20 /* Start with some simple checks on initialising the struct drm_mm */ memset(&mm, 0, sizeof(mm)); - if (drm_mm_initialized(&mm)) { - pr_err("zeroed mm claims to be initialized\n"); - return ret; - } + KUNIT_ASSERT_FALSE_MSG(test, drm_mm_initialized(&mm), + "zeroed mm claims to be initialized\n"); =20 memset(&mm, 0xff, sizeof(mm)); drm_mm_init(&mm, 0, size); if (!drm_mm_initialized(&mm)) { - pr_err("mm claims not to be initialized\n"); + KUNIT_FAIL(test, "mm claims not to be initialized\n"); goto out; } =20 if (!drm_mm_clean(&mm)) { - pr_err("mm not empty on creation\n"); + KUNIT_FAIL(test, "mm not empty on creation\n"); goto out; } =20 /* After creation, it should all be one massive hole */ - if (!assert_one_hole(&mm, 0, size)) { - ret =3D -EINVAL; + if (!assert_one_hole(test, &mm, 0, size)) { + KUNIT_FAIL(test, ""); goto out; } =20 memset(&tmp, 0, sizeof(tmp)); tmp.start =3D 0; tmp.size =3D size; - ret =3D drm_mm_reserve_node(&mm, &tmp); - if (ret) { - pr_err("failed to reserve whole drm_mm\n"); + if (drm_mm_reserve_node(&mm, &tmp)) { + KUNIT_FAIL(test, "failed to reserve whole drm_mm\n"); goto out; } =20 /* After filling the range entirely, there should be no holes */ - if (!assert_no_holes(&mm)) { - ret =3D -EINVAL; + if (!assert_no_holes(test, &mm)) { + KUNIT_FAIL(test, ""); goto out; } =20 /* And then after emptying it again, the massive hole should be back */ drm_mm_remove_node(&tmp); - if (!assert_one_hole(&mm, 0, size)) { - ret =3D -EINVAL; + if (!assert_one_hole(test, &mm, 0, size)) { + KUNIT_FAIL(test, ""); goto out; } =20 out: - if (ret) - show_mm(&mm); drm_mm_takedown(&mm); - return ret; } =20 -static int igt_debug(void *ignored) +static void igt_mm_debug(struct kunit *test) { struct drm_mm mm; struct drm_mm_node nodes[2]; - int ret; =20 /* Create a small drm_mm with a couple of nodes and a few holes, and * check that the debug iterator doesn't explode over a trivial drm_mm. @@ -277,24 +256,16 @@ static int igt_debug(void *ignored) memset(nodes, 0, sizeof(nodes)); nodes[0].start =3D 512; nodes[0].size =3D 1024; - ret =3D drm_mm_reserve_node(&mm, &nodes[0]); - if (ret) { - pr_err("failed to reserve node[0] {start=3D%lld, size=3D%lld)\n", - nodes[0].start, nodes[0].size); - return ret; - } + KUNIT_ASSERT_FALSE_MSG(test, drm_mm_reserve_node(&mm, &nodes[0]), + "failed to reserve node[0] {start=3D%lld, size=3D%lld)\n", + nodes[0].start, nodes[0].size); =20 nodes[1].size =3D 1024; nodes[1].start =3D 4096 - 512 - nodes[1].size; - ret =3D drm_mm_reserve_node(&mm, &nodes[1]); - if (ret) { - pr_err("failed to reserve node[1] {start=3D%lld, size=3D%lld)\n", - nodes[1].start, nodes[1].size); - return ret; - } + KUNIT_ASSERT_FALSE_MSG(test, drm_mm_reserve_node(&mm, &nodes[1]), + "failed to reserve node[0] {start=3D%lld, size=3D%lld)\n", + nodes[0].start, nodes[0].size); =20 - show_mm(&mm); - return 0; } =20 static struct drm_mm_node *set_node(struct drm_mm_node *node, @@ -305,7 +276,7 @@ static struct drm_mm_node *set_node(struct drm_mm_node = *node, return node; } =20 -static bool expect_reserve_fail(struct drm_mm *mm, struct drm_mm_node *nod= e) +static bool expect_reserve_fail(struct kunit *test, struct drm_mm *mm, str= uct drm_mm_node *node) { int err; =20 @@ -314,17 +285,18 @@ static bool expect_reserve_fail(struct drm_mm *mm, st= ruct drm_mm_node *node) return true; =20 if (!err) { - pr_err("impossible reserve succeeded, node %llu + %llu\n", - node->start, node->size); + KUNIT_FAIL(test, "impossible reserve succeeded, node %llu + %llu\n", + node->start, node->size); drm_mm_remove_node(node); } else { - pr_err("impossible reserve failed with wrong error %d [expected %d], nod= e %llu + %llu\n", + KUNIT_FAIL(test, + "impossible reserve failed with wrong error %d [expected %d], node %= llu + %llu\n", err, -ENOSPC, node->start, node->size); } return false; } =20 -static bool check_reserve_boundaries(struct drm_mm *mm, +static bool check_reserve_boundaries(struct kunit *test, struct drm_mm *mm, unsigned int count, u64 size) { @@ -356,11 +328,9 @@ static bool check_reserve_boundaries(struct drm_mm *mm, int n; =20 for (n =3D 0; n < ARRAY_SIZE(boundaries); n++) { - if (!expect_reserve_fail(mm, - set_node(&tmp, - boundaries[n].start, + if (!expect_reserve_fail(test, mm, set_node(&tmp, boundaries[n].start, boundaries[n].size))) { - pr_err("boundary[%d:%s] failed, count=3D%u, size=3D%lld\n", + KUNIT_FAIL(test, "boundary[%d:%s] failed, count=3D%u, size=3D%lld\n", n, boundaries[n].name, count, size); return false; } @@ -369,7 +339,7 @@ static bool check_reserve_boundaries(struct drm_mm *mm, return true; } =20 -static int __igt_reserve(unsigned int count, u64 size) +static int __igt_reserve(struct kunit *test, unsigned int count, u64 size) { DRM_RND_STATE(prng, random_seed); struct drm_mm mm; @@ -377,7 +347,7 @@ static int __igt_reserve(unsigned int count, u64 size) unsigned int *order, n, m, o =3D 0; int ret, err; =20 - /* For exercising drm_mm_reserve_node(), we want to check that + /* For exercising drm_mm_reserve_node(struct kunit *test, ), we want to c= heck that * reservations outside of the drm_mm range are rejected, and to * overlapping and otherwise already occupied ranges. Afterwards, * the tree and nodes should be intact. @@ -392,13 +362,12 @@ static int __igt_reserve(unsigned int count, u64 size) goto err; =20 nodes =3D vzalloc(array_size(count, sizeof(*nodes))); - if (!nodes) - goto err_order; + KUNIT_ASSERT_TRUE(test, nodes); =20 ret =3D -EINVAL; drm_mm_init(&mm, 0, count * size); =20 - if (!check_reserve_boundaries(&mm, count, size)) + if (!check_reserve_boundaries(test, &mm, count, size)) goto out; =20 for (n =3D 0; n < count; n++) { @@ -407,57 +376,53 @@ static int __igt_reserve(unsigned int count, u64 size) =20 err =3D drm_mm_reserve_node(&mm, &nodes[n]); if (err) { - pr_err("reserve failed, step %d, start %llu\n", + KUNIT_FAIL(test, "reserve failed, step %d, start %llu\n", n, nodes[n].start); ret =3D err; goto out; } =20 if (!drm_mm_node_allocated(&nodes[n])) { - pr_err("reserved node not allocated! step %d, start %llu\n", + KUNIT_FAIL(test, "reserved node not allocated! step %d, start %llu\n", n, nodes[n].start); goto out; } =20 - if (!expect_reserve_fail(&mm, &nodes[n])) + if (!expect_reserve_fail(test, &mm, &nodes[n])) goto out; } =20 /* After random insertion the nodes should be in order */ - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 /* Repeated use should then fail */ drm_random_reorder(order, count, &prng); for (n =3D 0; n < count; n++) { - if (!expect_reserve_fail(&mm, - set_node(&tmp, order[n] * size, 1))) + if (!expect_reserve_fail(test, &mm, set_node(&tmp, order[n] * size, 1))) goto out; =20 /* Remove and reinsert should work */ drm_mm_remove_node(&nodes[order[n]]); err =3D drm_mm_reserve_node(&mm, &nodes[order[n]]); if (err) { - pr_err("reserve failed, step %d, start %llu\n", + KUNIT_FAIL(test, "reserve failed, step %d, start %llu\n", n, nodes[n].start); ret =3D err; goto out; } } =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 /* Overlapping use should then fail */ for (n =3D 0; n < count; n++) { - if (!expect_reserve_fail(&mm, set_node(&tmp, 0, size*count))) + if (!expect_reserve_fail(test, &mm, set_node(&tmp, 0, size*count))) goto out; } for (n =3D 0; n < count; n++) { - if (!expect_reserve_fail(&mm, - set_node(&tmp, - size * n, - size * (count - n)))) + if (!expect_reserve_fail(test, &mm, set_node(&tmp, size * n, size * (cou= nt - n)))) goto out; } =20 @@ -472,7 +437,7 @@ static int __igt_reserve(unsigned int count, u64 size) node =3D &nodes[order[(o + m) % count]]; err =3D drm_mm_reserve_node(&mm, node); if (err) { - pr_err("reserve failed, step %d/%d, start %llu\n", + KUNIT_FAIL(test, "reserve failed, step %d/%d, start %llu\n", m, n, node->start); ret =3D err; goto out; @@ -481,7 +446,7 @@ static int __igt_reserve(unsigned int count, u64 size) =20 o +=3D n; =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; } =20 @@ -491,41 +456,29 @@ static int __igt_reserve(unsigned int count, u64 size) drm_mm_remove_node(node); drm_mm_takedown(&mm); vfree(nodes); -err_order: kfree(order); err: return ret; } =20 -static int igt_reserve(void *ignored) +static void igt_mm_reserve(struct kunit *test) { const unsigned int count =3D min_t(unsigned int, BIT(10), max_iterations); - int n, ret; + int n; =20 for_each_prime_number_from(n, 1, 54) { u64 size =3D BIT_ULL(n); =20 - ret =3D __igt_reserve(count, size - 1); - if (ret) - return ret; - - ret =3D __igt_reserve(count, size); - if (ret) - return ret; - - ret =3D __igt_reserve(count, size + 1); - if (ret) - return ret; + KUNIT_ASSERT_FALSE(test, __igt_reserve(test, count, size - 1)); + KUNIT_ASSERT_FALSE(test, __igt_reserve(test, count, size)); + KUNIT_ASSERT_FALSE(test, __igt_reserve(test, count, size + 1)); =20 cond_resched(); } - - return 0; } =20 -static bool expect_insert(struct drm_mm *mm, struct drm_mm_node *node, - u64 size, u64 alignment, unsigned long color, - const struct insert_mode *mode) +static bool expect_insert(struct kunit *test, struct drm_mm *mm, struct dr= m_mm_node *node, + u64 size, u64 alignment, unsigned long color, const struct insert_mod= e *mode) { int err; =20 @@ -533,12 +486,13 @@ static bool expect_insert(struct drm_mm *mm, struct d= rm_mm_node *node, size, alignment, color, mode->mode); if (err) { - pr_err("insert (size=3D%llu, alignment=3D%llu, color=3D%lu, mode=3D%s) f= ailed with err=3D%d\n", - size, alignment, color, mode->name, err); + KUNIT_FAIL(test, + "insert (size=3D%llu, alignment=3D%llu, color=3D%lu, mode=3D%s) fail= ed with err=3D%d\n", + size, alignment, color, mode->name, err); return false; } =20 - if (!assert_node(node, mm, size, alignment, color)) { + if (!assert_node(test, node, mm, size, alignment, color)) { drm_mm_remove_node(node); return false; } @@ -546,7 +500,7 @@ static bool expect_insert(struct drm_mm *mm, struct drm= _mm_node *node, return true; } =20 -static bool expect_insert_fail(struct drm_mm *mm, u64 size) +static bool expect_insert_fail(struct kunit *test, struct drm_mm *mm, u64 = size) { struct drm_mm_node tmp =3D {}; int err; @@ -556,17 +510,18 @@ static bool expect_insert_fail(struct drm_mm *mm, u64= size) return true; =20 if (!err) { - pr_err("impossible insert succeeded, node %llu + %llu\n", + KUNIT_FAIL(test, "impossible insert succeeded, node %llu + %llu\n", tmp.start, tmp.size); drm_mm_remove_node(&tmp); } else { - pr_err("impossible insert failed with wrong error %d [expected %d], size= %llu\n", - err, -ENOSPC, size); + KUNIT_FAIL(test, + "impossible insert failed with wrong error %d [expected %d], size %l= lu\n", + err, -ENOSPC, size); } return false; } =20 -static int __igt_insert(unsigned int count, u64 size, bool replace) +static int __igt_insert(struct kunit *test, unsigned int count, u64 size, = bool replace) { DRM_RND_STATE(prng, random_seed); const struct insert_mode *mode; @@ -582,8 +537,7 @@ static int __igt_insert(unsigned int count, u64 size, b= ool replace) =20 ret =3D -ENOMEM; nodes =3D vmalloc(array_size(count, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 order =3D drm_random_order(count, &prng); if (!order) @@ -598,8 +552,8 @@ static int __igt_insert(unsigned int count, u64 size, b= ool replace) =20 node =3D replace ? &tmp : &nodes[n]; memset(node, 0, sizeof(*node)); - if (!expect_insert(&mm, node, size, 0, n, mode)) { - pr_err("%s insert failed, size %llu step %d\n", + if (!expect_insert(test, &mm, node, size, 0, n, mode)) { + KUNIT_FAIL(test, "%s insert failed, size %llu step %d\n", mode->name, size, n); goto out; } @@ -607,32 +561,34 @@ static int __igt_insert(unsigned int count, u64 size,= bool replace) if (replace) { drm_mm_replace_node(&tmp, &nodes[n]); if (drm_mm_node_allocated(&tmp)) { - pr_err("replaced old-node still allocated! step %d\n", - n); + KUNIT_FAIL(test, + "replaced old-node still allocated! step %d\n", + n); goto out; } =20 - if (!assert_node(&nodes[n], &mm, size, 0, n)) { - pr_err("replaced node did not inherit parameters, size %llu step %d\n= ", - size, n); + if (!assert_node(test, &nodes[n], &mm, size, 0, n)) { + KUNIT_FAIL(test, + "replaced node did not inherit parameters, size %llu step %d\n", + size, n); goto out; } =20 if (tmp.start !=3D nodes[n].start) { - pr_err("replaced node mismatch location expected [%llx + %llx], found= [%llx + %llx]\n", - tmp.start, size, - nodes[n].start, nodes[n].size); + KUNIT_FAIL(test, + "replaced node mismatch location expected [%llx + %llx], found [%= llx + %llx]\n", + tmp.start, size, nodes[n].start, nodes[n].size); goto out; } } } =20 /* After random insertion the nodes should be in order */ - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 /* Repeated use should then fail */ - if (!expect_insert_fail(&mm, size)) + if (!expect_insert_fail(test, &mm, size)) goto out; =20 /* Remove one and reinsert, as the only hole it should refill itself */ @@ -640,19 +596,20 @@ static int __igt_insert(unsigned int count, u64 size,= bool replace) u64 addr =3D nodes[n].start; =20 drm_mm_remove_node(&nodes[n]); - if (!expect_insert(&mm, &nodes[n], size, 0, n, mode)) { - pr_err("%s reinsert failed, size %llu step %d\n", + if (!expect_insert(test, &mm, &nodes[n], size, 0, n, mode)) { + KUNIT_FAIL(test, "%s reinsert failed, size %llu step %d\n", mode->name, size, n); goto out; } =20 if (nodes[n].start !=3D addr) { - pr_err("%s reinsert node moved, step %d, expected %llx, found %llx\n", - mode->name, n, addr, nodes[n].start); + KUNIT_FAIL(test, + "%s reinsert node moved, step %d, expected %llx, found %llx\n", + mode->name, n, addr, nodes[n].start); goto out; } =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; } =20 @@ -665,19 +622,20 @@ static int __igt_insert(unsigned int count, u64 size,= bool replace) =20 for (m =3D 0; m < n; m++) { node =3D &nodes[order[(o + m) % count]]; - if (!expect_insert(&mm, node, size, 0, n, mode)) { - pr_err("%s multiple reinsert failed, size %llu step %d\n", - mode->name, size, n); + if (!expect_insert(test, &mm, node, size, 0, n, mode)) { + KUNIT_FAIL(test, + "%s multiple reinsert failed, size %llu step %d\n", + mode->name, size, n); goto out; } } =20 o +=3D n; =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 - if (!expect_insert_fail(&mm, size)) + if (!expect_insert_fail(test, &mm, size)) goto out; } =20 @@ -696,42 +654,30 @@ static int __igt_insert(unsigned int count, u64 size,= bool replace) kfree(order); err_nodes: vfree(nodes); -err: return ret; } =20 -static int igt_insert(void *ignored) +static void igt_mm_insert(struct kunit *test) { const unsigned int count =3D min_t(unsigned int, BIT(10), max_iterations); unsigned int n; - int ret; =20 for_each_prime_number_from(n, 1, 54) { u64 size =3D BIT_ULL(n); =20 - ret =3D __igt_insert(count, size - 1, false); - if (ret) - return ret; - - ret =3D __igt_insert(count, size, false); - if (ret) - return ret; - - ret =3D __igt_insert(count, size + 1, false); - if (ret) - return ret; + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size - 1, false)); + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size, false)); + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size + 1, false)); =20 cond_resched(); } =20 - return 0; } =20 -static int igt_replace(void *ignored) +static void igt_mm_replace(struct kunit *test) { const unsigned int count =3D min_t(unsigned int, BIT(10), max_iterations); unsigned int n; - int ret; =20 /* Reuse igt_insert to exercise replacement by inserting a dummy node, * then replacing it with the intended node. We want to check that @@ -742,28 +688,17 @@ static int igt_replace(void *ignored) for_each_prime_number_from(n, 1, 54) { u64 size =3D BIT_ULL(n); =20 - ret =3D __igt_insert(count, size - 1, true); - if (ret) - return ret; - - ret =3D __igt_insert(count, size, true); - if (ret) - return ret; - - ret =3D __igt_insert(count, size + 1, true); - if (ret) - return ret; + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size - 1, true)); + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size, true)); + KUNIT_ASSERT_FALSE(test, __igt_insert(test, count, size + 1, true)); =20 cond_resched(); } - - return 0; } =20 -static bool expect_insert_in_range(struct drm_mm *mm, struct drm_mm_node *= node, +static bool expect_insert_in_range(struct kunit *test, struct drm_mm *mm, = struct drm_mm_node *node, u64 size, u64 alignment, unsigned long color, - u64 range_start, u64 range_end, - const struct insert_mode *mode) + u64 range_start, u64 range_end, const struct insert_mode *mode) { int err; =20 @@ -772,13 +707,14 @@ static bool expect_insert_in_range(struct drm_mm *mm,= struct drm_mm_node *node, range_start, range_end, mode->mode); if (err) { - pr_err("insert (size=3D%llu, alignment=3D%llu, color=3D%lu, mode=3D%s) n= to range [%llx, %llx] failed with err=3D%d\n", - size, alignment, color, mode->name, - range_start, range_end, err); + KUNIT_FAIL(test, + "insert (size=3D%llu, alignment=3D%llu, color=3D%lu, mode=3D%s) nto= range [%llx, %llx] failed with err=3D%d\n", + size, alignment, color, mode->name, + range_start, range_end, err); return false; } =20 - if (!assert_node(node, mm, size, alignment, color)) { + if (!assert_node(test, node, mm, size, alignment, color)) { drm_mm_remove_node(node); return false; } @@ -786,67 +722,63 @@ static bool expect_insert_in_range(struct drm_mm *mm,= struct drm_mm_node *node, return true; } =20 -static bool expect_insert_in_range_fail(struct drm_mm *mm, - u64 size, - u64 range_start, - u64 range_end) +static bool expect_insert_in_range_fail(struct kunit *test, struct drm_mm = *mm, + u64 size, u64 range_start, u64 range_end) { struct drm_mm_node tmp =3D {}; int err; =20 - err =3D drm_mm_insert_node_in_range(mm, &tmp, - size, 0, 0, - range_start, range_end, + err =3D drm_mm_insert_node_in_range(mm, &tmp, size, 0, 0, range_start, ra= nge_end, 0); if (likely(err =3D=3D -ENOSPC)) return true; =20 if (!err) { - pr_err("impossible insert succeeded, node %llx + %llu, range [%llx, %llx= ]\n", - tmp.start, tmp.size, range_start, range_end); + KUNIT_FAIL(test, + "impossible insert succeeded, node %llx + %llu, range [%llx, %llx]\= n", + tmp.start, tmp.size, range_start, range_end); drm_mm_remove_node(&tmp); } else { - pr_err("impossible insert failed with wrong error %d [expected %d], size= %llu, range [%llx, %llx]\n", - err, -ENOSPC, size, range_start, range_end); + KUNIT_FAIL(test, + "impossible insert failed with wrong error %d [expected %d], size %= llu, range [%llx, %llx]\n", + err, -ENOSPC, size, range_start, range_end); } =20 return false; } =20 -static bool assert_contiguous_in_range(struct drm_mm *mm, - u64 size, - u64 start, - u64 end) +static bool assert_contiguous_in_range(struct kunit *test, struct drm_mm *= mm, + u64 size, u64 start, u64 end) { struct drm_mm_node *node; unsigned int n; =20 - if (!expect_insert_in_range_fail(mm, size, start, end)) + if (!expect_insert_in_range_fail(test, mm, size, start, end)) return false; =20 n =3D div64_u64(start + size - 1, size); drm_mm_for_each_node(node, mm) { if (node->start < start || node->start + node->size > end) { - pr_err("node %d out of range, address [%llx + %llu], range [%llx, %llx]= \n", - n, node->start, node->start + node->size, start, end); + KUNIT_FAIL(test, + "node %d out of range, address [%llx + %llu], range [%llx, %llx]\n= ", + n, node->start, node->start + node->size, start, end); return false; } =20 if (node->start !=3D n * size) { - pr_err("node %d out of order, expected start %llx, found %llx\n", + KUNIT_FAIL(test, "node %d out of order, expected start %llx, found %llx= \n", n, n * size, node->start); return false; } =20 if (node->size !=3D size) { - pr_err("node %d has wrong size, expected size %llx, found %llx\n", + KUNIT_FAIL(test, "node %d has wrong size, expected size %llx, found %ll= x\n", n, size, node->size); return false; } =20 - if (drm_mm_hole_follows(node) && - drm_mm_hole_node_end(node) < end) { - pr_err("node %d is followed by a hole!\n", n); + if (drm_mm_hole_follows(node) && drm_mm_hole_node_end(node) < end) { + KUNIT_FAIL(test, "node %d is followed by a hole!\n", n); return false; } =20 @@ -856,7 +788,7 @@ static bool assert_contiguous_in_range(struct drm_mm *m= m, if (start > 0) { node =3D __drm_mm_interval_first(mm, 0, start - 1); if (drm_mm_node_allocated(node)) { - pr_err("node before start: node=3D%llx+%llu, start=3D%llx\n", + KUNIT_FAIL(test, "node before start: node=3D%llx+%llu, start=3D%llx\n", node->start, node->size, start); return false; } @@ -865,7 +797,7 @@ static bool assert_contiguous_in_range(struct drm_mm *m= m, if (end < U64_MAX) { node =3D __drm_mm_interval_first(mm, end, U64_MAX); if (drm_mm_node_allocated(node)) { - pr_err("node after end: node=3D%llx+%llu, end=3D%llx\n", + KUNIT_FAIL(test, "node after end: node=3D%llx+%llu, end=3D%llx\n", node->start, node->size, end); return false; } @@ -874,7 +806,7 @@ static bool assert_contiguous_in_range(struct drm_mm *m= m, return true; } =20 -static int __igt_insert_range(unsigned int count, u64 size, u64 start, u64= end) +static int __igt_insert_range(struct kunit *test, unsigned int count, u64 = size, u64 start, u64 end) { const struct insert_mode *mode; struct drm_mm mm; @@ -886,14 +818,13 @@ static int __igt_insert_range(unsigned int count, u64= size, u64 start, u64 end) DRM_MM_BUG_ON(!size); DRM_MM_BUG_ON(end <=3D start); =20 - /* Very similar to __igt_insert(), but now instead of populating the + /* Very similar to __igt_insert(struct kunit *test, ), but now instead of= populating the * full range of the drm_mm, we try to fill a small portion of it. */ =20 ret =3D -ENOMEM; nodes =3D vzalloc(array_size(count, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 ret =3D -EINVAL; drm_mm_init(&mm, 0, count * size); @@ -903,20 +834,19 @@ static int __igt_insert_range(unsigned int count, u64= size, u64 start, u64 end) =20 for (mode =3D insert_modes; mode->name; mode++) { for (n =3D start_n; n <=3D end_n; n++) { - if (!expect_insert_in_range(&mm, &nodes[n], - size, size, n, - start, end, mode)) { - pr_err("%s insert failed, size %llu, step %d [%d, %d], range [%llx, %l= lx]\n", - mode->name, size, n, - start_n, end_n, - start, end); + if (!expect_insert_in_range(test, &mm, &nodes[n], size, size, n, + start, end, mode)) { + KUNIT_FAIL(test, + "%s insert failed, size %llu, step %d [%d, %d], range [%llx, %llx= ]\n", + mode->name, size, n, start_n, end_n, start, end); goto out; } } =20 - if (!assert_contiguous_in_range(&mm, size, start, end)) { - pr_err("%s: range [%llx, %llx] not full after initialisation, size=3D%l= lu\n", - mode->name, start, end, size); + if (!assert_contiguous_in_range(test, &mm, size, start, end)) { + KUNIT_FAIL(test, + "%s: range [%llx, %llx] not full after initialisation, size=3D%llu\= n", + mode->name, start, end, size); goto out; } =20 @@ -925,23 +855,24 @@ static int __igt_insert_range(unsigned int count, u64= size, u64 start, u64 end) u64 addr =3D nodes[n].start; =20 drm_mm_remove_node(&nodes[n]); - if (!expect_insert_in_range(&mm, &nodes[n], - size, size, n, + if (!expect_insert_in_range(test, &mm, &nodes[n], size, size, n, start, end, mode)) { - pr_err("%s reinsert failed, step %d\n", mode->name, n); + KUNIT_FAIL(test, "%s reinsert failed, step %d\n", mode->name, n); goto out; } =20 if (nodes[n].start !=3D addr) { - pr_err("%s reinsert node moved, step %d, expected %llx, found %llx\n", - mode->name, n, addr, nodes[n].start); + KUNIT_FAIL(test, + "%s reinsert node moved, step %d, expected %llx, found %llx\n", + mode->name, n, addr, nodes[n].start); goto out; } } =20 - if (!assert_contiguous_in_range(&mm, size, start, end)) { - pr_err("%s: range [%llx, %llx] not full after reinsertion, size=3D%llu\= n", - mode->name, start, end, size); + if (!assert_contiguous_in_range(test, &mm, size, start, end)) { + KUNIT_FAIL(test, + "%s: range [%llx, %llx] not full after reinsertion, size=3D%llu\n", + mode->name, start, end, size); goto out; } =20 @@ -958,11 +889,10 @@ static int __igt_insert_range(unsigned int count, u64= size, u64 start, u64 end) drm_mm_remove_node(node); drm_mm_takedown(&mm); vfree(nodes); -err: return ret; } =20 -static int insert_outside_range(void) +static int insert_outside_range(struct kunit *test) { struct drm_mm mm; const unsigned int start =3D 1024; @@ -971,81 +901,57 @@ static int insert_outside_range(void) =20 drm_mm_init(&mm, start, size); =20 - if (!expect_insert_in_range_fail(&mm, 1, 0, start)) + if (!expect_insert_in_range_fail(test, &mm, 1, 0, start)) return -EINVAL; =20 - if (!expect_insert_in_range_fail(&mm, size, + if (!expect_insert_in_range_fail(test, &mm, size, start - size/2, start + (size+1)/2)) return -EINVAL; =20 - if (!expect_insert_in_range_fail(&mm, size, + if (!expect_insert_in_range_fail(test, &mm, size, end - (size+1)/2, end + size/2)) return -EINVAL; =20 - if (!expect_insert_in_range_fail(&mm, 1, end, end + size)) + if (!expect_insert_in_range_fail(test, &mm, 1, end, end + size)) return -EINVAL; =20 drm_mm_takedown(&mm); return 0; } =20 -static int igt_insert_range(void *ignored) +static void igt_mm_insert_range(struct kunit *test) { const unsigned int count =3D min_t(unsigned int, BIT(13), max_iterations); unsigned int n; - int ret; =20 /* Check that requests outside the bounds of drm_mm are rejected. */ - ret =3D insert_outside_range(); - if (ret) - return ret; + KUNIT_ASSERT_FALSE(test, insert_outside_range(test)); =20 for_each_prime_number_from(n, 1, 50) { const u64 size =3D BIT_ULL(n); const u64 max =3D count * size; =20 - ret =3D __igt_insert_range(count, size, 0, max); - if (ret) - return ret; - - ret =3D __igt_insert_range(count, size, 1, max); - if (ret) - return ret; - - ret =3D __igt_insert_range(count, size, 0, max - 1); - if (ret) - return ret; - - ret =3D __igt_insert_range(count, size, 0, max/2); - if (ret) - return ret; - - ret =3D __igt_insert_range(count, size, max/2, max); - if (ret) - return ret; - - ret =3D __igt_insert_range(count, size, max/4+1, 3*max/4-1); - if (ret) - return ret; + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, 0, max)); + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, 1, max)); + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, 0, max - = 1)); + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, 0, max/2)= ); + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, max/2, ma= x/2)); + KUNIT_ASSERT_FALSE(test, __igt_insert_range(test, count, size, max/4+1, = 3*max/4-1)); =20 cond_resched(); } - - return 0; } =20 -static int prepare_igt_frag(struct drm_mm *mm, - struct drm_mm_node *nodes, - unsigned int num_insert, +static int prepare_igt_frag(struct kunit *test, struct drm_mm *mm, + struct drm_mm_node *nodes, unsigned int num_insert, const struct insert_mode *mode) { unsigned int size =3D 4096; unsigned int i; =20 for (i =3D 0; i < num_insert; i++) { - if (!expect_insert(mm, &nodes[i], size, 0, i, - mode) !=3D 0) { - pr_err("%s insert failed\n", mode->name); + if (!expect_insert(test, mm, &nodes[i], size, 0, i, mode) !=3D 0) { + KUNIT_FAIL(test, "%s insert failed\n", mode->name); return -EINVAL; } } @@ -1060,9 +966,8 @@ static int prepare_igt_frag(struct drm_mm *mm, =20 } =20 -static u64 get_insert_time(struct drm_mm *mm, - unsigned int num_insert, - struct drm_mm_node *nodes, +static u64 get_insert_time(struct kunit *test, struct drm_mm *mm, + unsigned int num_insert, struct drm_mm_node *nodes, const struct insert_mode *mode) { unsigned int size =3D 8192; @@ -1071,8 +976,8 @@ static u64 get_insert_time(struct drm_mm *mm, =20 start =3D ktime_get(); for (i =3D 0; i < num_insert; i++) { - if (!expect_insert(mm, &nodes[i], size, 0, i, mode) !=3D 0) { - pr_err("%s insert failed\n", mode->name); + if (!expect_insert(test, mm, &nodes[i], size, 0, i, mode) !=3D 0) { + KUNIT_FAIL(test, "%s insert failed\n", mode->name); return 0; } } @@ -1080,27 +985,25 @@ static u64 get_insert_time(struct drm_mm *mm, return ktime_to_ns(ktime_sub(ktime_get(), start)); } =20 -static int igt_frag(void *ignored) +static void igt_mm_frag(struct kunit *test) { struct drm_mm mm; const struct insert_mode *mode; struct drm_mm_node *nodes, *node, *next; unsigned int insert_size =3D 10000; unsigned int scale_factor =3D 4; - int ret =3D -EINVAL; =20 /* We need 4 * insert_size nodes to hold intermediate allocated * drm_mm nodes. - * 1 times for prepare_igt_frag() - * 1 times for get_insert_time() - * 2 times for get_insert_time() + * 1 times for prepare_igt_frag(struct kunit *test, ) + * 1 times for get_insert_time(struct kunit *test, ) + * 2 times for get_insert_time(struct kunit *test, ) */ nodes =3D vzalloc(array_size(insert_size * 4, sizeof(*nodes))); - if (!nodes) - return -ENOMEM; + KUNIT_ASSERT_TRUE(test, nodes); =20 /* For BOTTOMUP and TOPDOWN, we first fragment the - * address space using prepare_igt_frag() and then try to verify + * address space using prepare_igt_frag(struct kunit *test, ) and then tr= y to verify * that that insertions scale quadratically from 10k to 20k insertions */ drm_mm_init(&mm, 1, U64_MAX - 2); @@ -1111,28 +1014,25 @@ static int igt_frag(void *ignored) mode->mode !=3D DRM_MM_INSERT_HIGH) continue; =20 - ret =3D prepare_igt_frag(&mm, nodes, insert_size, mode); - if (ret) + if (prepare_igt_frag(test, &mm, nodes, insert_size, mode)) goto err; =20 - insert_time1 =3D get_insert_time(&mm, insert_size, + insert_time1 =3D get_insert_time(test, &mm, insert_size, nodes + insert_size, mode); if (insert_time1 =3D=3D 0) goto err; =20 - insert_time2 =3D get_insert_time(&mm, (insert_size * 2), + insert_time2 =3D get_insert_time(test, &mm, (insert_size * 2), nodes + insert_size * 2, mode); if (insert_time2 =3D=3D 0) goto err; =20 - pr_info("%s fragmented insert of %u and %u insertions took %llu and %llu= nsecs\n", - mode->name, insert_size, insert_size * 2, - insert_time1, insert_time2); + kunit_info(test, "%s fragmented insert of %u and %u insertions took %llu= and %llu nsecs\n", + mode->name, insert_size, insert_size * 2, insert_time1, insert_time2); =20 if (insert_time2 > (scale_factor * insert_time1)) { - pr_err("%s fragmented insert took %llu nsecs more\n", - mode->name, - insert_time2 - (scale_factor * insert_time1)); + KUNIT_FAIL(test, "%s fragmented insert took %llu nsecs more\n", + mode->name, insert_time2 - (scale_factor * insert_time1)); goto err; } =20 @@ -1140,24 +1040,20 @@ static int igt_frag(void *ignored) drm_mm_remove_node(node); } =20 - ret =3D 0; err: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); drm_mm_takedown(&mm); vfree(nodes); - - return ret; } =20 -static int igt_align(void *ignored) +static void igt_mm_align(struct kunit *test) { const struct insert_mode *mode; const unsigned int max_count =3D min(8192u, max_prime); struct drm_mm mm; struct drm_mm_node *nodes, *node, *next; unsigned int prime; - int ret =3D -EINVAL; =20 /* For each of the possible insertion modes, we pick a few * arbitrary alignments and check that the inserted node @@ -1165,8 +1061,7 @@ static int igt_align(void *ignored) */ =20 nodes =3D vzalloc(array_size(max_count, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 drm_mm_init(&mm, 1, U64_MAX - 2); =20 @@ -1176,10 +1071,8 @@ static int igt_align(void *ignored) for_each_prime_number_from(prime, 1, max_count) { u64 size =3D next_prime_number(prime); =20 - if (!expect_insert(&mm, &nodes[i], - size, prime, i, - mode)) { - pr_err("%s insert failed with alignment=3D%d", + if (!expect_insert(test, &mm, &nodes[i], size, prime, i, mode)) { + KUNIT_FAIL(test, "%s insert failed with alignment=3D%d", mode->name, prime); goto out; } @@ -1194,22 +1087,18 @@ static int igt_align(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); drm_mm_takedown(&mm); vfree(nodes); -err: - return ret; } =20 -static int igt_align_pot(int max) +static void igt_align_pot(struct kunit *test, int max) { struct drm_mm mm; struct drm_mm_node *node, *next; int bit; - int ret =3D -EINVAL; =20 /* Check that we can align to the full u64 address space */ =20 @@ -1220,51 +1109,45 @@ static int igt_align_pot(int max) =20 node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { - ret =3D -ENOMEM; + KUNIT_FAIL(test, "failed to allocate node"); goto out; } =20 align =3D BIT_ULL(bit); size =3D BIT_ULL(bit-1) + 1; - if (!expect_insert(&mm, node, - size, align, bit, - &insert_modes[0])) { - pr_err("insert failed with alignment=3D%llx [%d]", - align, bit); + if (!expect_insert(test, &mm, node, size, align, bit, &insert_modes[0]))= { + KUNIT_FAIL(test, "insert failed with alignment=3D%llx [%d]", align, bit= ); goto out; } =20 cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) { drm_mm_remove_node(node); kfree(node); } drm_mm_takedown(&mm); - return ret; } =20 -static int igt_align32(void *ignored) +static void igt_mm_align32(struct kunit *test) { - return igt_align_pot(32); + igt_align_pot(test, 32); } =20 -static int igt_align64(void *ignored) +static void igt_mm_align64(struct kunit *test) { - return igt_align_pot(64); + igt_align_pot(test, 64); } =20 -static void show_scan(const struct drm_mm_scan *scan) +static void show_scan(struct kunit *test, const struct drm_mm_scan *scan) { - pr_info("scan: hit [%llx, %llx], size=3D%lld, align=3D%lld, color=3D%ld\n= ", - scan->hit_start, scan->hit_end, - scan->size, scan->alignment, scan->color); + kunit_info(test, "scan: hit [%llx, %llx], size=3D%lld, align=3D%lld, colo= r=3D%ld\n", + scan->hit_start, scan->hit_end, scan->size, scan->alignment, scan->color= ); } =20 -static void show_holes(const struct drm_mm *mm, int count) +static void show_holes(struct kunit *test, const struct drm_mm *mm, int co= unt) { u64 hole_start, hole_end; struct drm_mm_node *hole; @@ -1274,19 +1157,15 @@ static void show_holes(const struct drm_mm *mm, int= count) const char *node1 =3D NULL, *node2 =3D NULL; =20 if (drm_mm_node_allocated(hole)) - node1 =3D kasprintf(GFP_KERNEL, - "[%llx + %lld, color=3D%ld], ", + node1 =3D kasprintf(GFP_KERNEL, "[%llx + %lld, color=3D%ld], ", hole->start, hole->size, hole->color); =20 if (drm_mm_node_allocated(next)) - node2 =3D kasprintf(GFP_KERNEL, - ", [%llx + %lld, color=3D%ld]", + node2 =3D kasprintf(GFP_KERNEL, ", [%llx + %lld, color=3D%ld]", next->start, next->size, next->color); =20 - pr_info("%sHole [%llx - %llx, size %lld]%s\n", - node1, - hole_start, hole_end, hole_end - hole_start, - node2); + kunit_info(test, "%sHole [%llx - %llx, size %lld]%s\n", node1, + hole_start, hole_end, hole_end - hole_start, node2); =20 kfree(node2); kfree(node1); @@ -1301,12 +1180,9 @@ struct evict_node { struct list_head link; }; =20 -static bool evict_nodes(struct drm_mm_scan *scan, - struct evict_node *nodes, - unsigned int *order, - unsigned int count, - bool use_color, - struct list_head *evict_list) +static bool evict_nodes(struct kunit *test, struct drm_mm_scan *scan, + struct evict_node *nodes, unsigned int *order, unsigned int count, + bool use_color, struct list_head *evict_list) { struct evict_node *e, *en; unsigned int i; @@ -1322,8 +1198,9 @@ static bool evict_nodes(struct drm_mm_scan *scan, list_del(&e->link); } if (list_empty(evict_list)) { - pr_err("Failed to find eviction: size=3D%lld [avail=3D%d], align=3D%lld = (color=3D%lu)\n", - scan->size, count, scan->alignment, scan->color); + KUNIT_FAIL(test, + "Failed to find eviction: size=3D%lld [avail=3D%d], align=3D%lld (co= lor=3D%lu)\n", + scan->size, count, scan->alignment, scan->color); return false; } =20 @@ -1340,7 +1217,8 @@ static bool evict_nodes(struct drm_mm_scan *scan, } } else { if (drm_mm_scan_color_evict(scan)) { - pr_err("drm_mm_scan_color_evict unexpectedly reported overlapping nodes= !\n"); + KUNIT_FAIL(test, + "drm_mm_scan_color_evict unexpectedly reported overlapping nodes!\n= "); return false; } } @@ -1348,9 +1226,8 @@ static bool evict_nodes(struct drm_mm_scan *scan, return true; } =20 -static bool evict_nothing(struct drm_mm *mm, - unsigned int total_size, - struct evict_node *nodes) +static bool evict_nothing(struct kunit *test, struct drm_mm *mm, + unsigned int total_size, struct evict_node *nodes) { struct drm_mm_scan scan; LIST_HEAD(evict_list); @@ -1371,7 +1248,7 @@ static bool evict_nothing(struct drm_mm *mm, e =3D &nodes[n]; =20 if (!drm_mm_node_allocated(&e->node)) { - pr_err("node[%d] no longer allocated!\n", n); + KUNIT_FAIL(test, "node[%d] no longer allocated!\n", n); return false; } =20 @@ -1387,17 +1264,16 @@ static bool evict_nothing(struct drm_mm *mm, e =3D &nodes[n]; =20 if (!e->link.next) { - pr_err("node[%d] no longer connected!\n", n); + KUNIT_FAIL(test, "node[%d] no longer connected!\n", n); return false; } } =20 - return assert_continuous(mm, nodes[0].node.size); + return assert_continuous(test, mm, nodes[0].node.size); } =20 -static bool evict_everything(struct drm_mm *mm, - unsigned int total_size, - struct evict_node *nodes) +static bool evict_everything(struct kunit *test, struct drm_mm *mm, + unsigned int total_size, struct evict_node *nodes) { struct drm_mm_scan scan; LIST_HEAD(evict_list); @@ -1417,7 +1293,7 @@ static bool evict_everything(struct drm_mm *mm, list_for_each_entry(e, &evict_list, link) { if (!drm_mm_scan_remove_block(&scan, &e->node)) { if (!err) { - pr_err("Node %lld not marked for eviction!\n", + KUNIT_FAIL(test, "Node %lld not marked for eviction!\n", e->node.start); err =3D -EINVAL; } @@ -1429,29 +1305,25 @@ static bool evict_everything(struct drm_mm *mm, list_for_each_entry(e, &evict_list, link) drm_mm_remove_node(&e->node); =20 - if (!assert_one_hole(mm, 0, total_size)) + if (!assert_one_hole(test, mm, 0, total_size)) return false; =20 list_for_each_entry(e, &evict_list, link) { err =3D drm_mm_reserve_node(mm, &e->node); if (err) { - pr_err("Failed to reinsert node after eviction: start=3D%llx\n", + KUNIT_FAIL(test, "Failed to reinsert node after eviction: start=3D%llx\= n", e->node.start); return false; } } =20 - return assert_continuous(mm, nodes[0].node.size); + return assert_continuous(test, mm, nodes[0].node.size); } =20 -static int evict_something(struct drm_mm *mm, - u64 range_start, u64 range_end, - struct evict_node *nodes, - unsigned int *order, - unsigned int count, - unsigned int size, - unsigned int alignment, - const struct insert_mode *mode) +static int evict_something(struct kunit *test, struct drm_mm *mm, + u64 range_start, u64 range_end, struct evict_node *nodes, + unsigned int *order, unsigned int count, unsigned int size, + unsigned int alignment, const struct insert_mode *mode) { struct drm_mm_scan scan; LIST_HEAD(evict_list); @@ -1459,38 +1331,35 @@ static int evict_something(struct drm_mm *mm, struct drm_mm_node tmp; int err; =20 - drm_mm_scan_init_with_range(&scan, mm, - size, alignment, 0, - range_start, range_end, - mode->mode); - if (!evict_nodes(&scan, - nodes, order, count, false, - &evict_list)) + drm_mm_scan_init_with_range(&scan, mm, size, alignment, 0, range_start, + range_end, mode->mode); + if (!evict_nodes(test, &scan, nodes, order, count, false, &evict_list)) return -EINVAL; =20 memset(&tmp, 0, sizeof(tmp)); err =3D drm_mm_insert_node_generic(mm, &tmp, size, alignment, 0, DRM_MM_INSERT_EVICT); if (err) { - pr_err("Failed to insert into eviction hole: size=3D%d, align=3D%d\n", + KUNIT_FAIL(test, "Failed to insert into eviction hole: size=3D%d, align= =3D%d\n", size, alignment); - show_scan(&scan); - show_holes(mm, 3); + show_scan(test, &scan); + show_holes(test, mm, 3); return err; } =20 if (tmp.start < range_start || tmp.start + tmp.size > range_end) { - pr_err("Inserted [address=3D%llu + %llu] did not fit into the request ra= nge [%llu, %llu]\n", - tmp.start, tmp.size, range_start, range_end); + KUNIT_FAIL(test, + "Inserted [address=3D%llu + %llu] did not fit into the request range= [%llu, %llu]\n", + tmp.start, tmp.size, range_start, range_end); err =3D -EINVAL; } =20 - if (!assert_node(&tmp, mm, size, alignment, 0) || + if (!assert_node(test, &tmp, mm, size, alignment, 0) || drm_mm_hole_follows(&tmp)) { - pr_err("Inserted did not fill the eviction hole: size=3D%lld [%d], align= =3D%d [rem=3D%lld], start=3D%llx, hole-follows?=3D%d\n", - tmp.size, size, - alignment, misalignment(&tmp, alignment), - tmp.start, drm_mm_hole_follows(&tmp)); + KUNIT_FAIL(test, + "Inserted did not fill the eviction hole: size=3D%lld [%d], align=3D= %d [rem=3D%lld], start=3D%llx, hole-follows?=3D%d\n", + tmp.size, size, alignment, misalignment(&tmp, alignment), + tmp.start, drm_mm_hole_follows(&tmp)); err =3D -EINVAL; } =20 @@ -1501,21 +1370,21 @@ static int evict_something(struct drm_mm *mm, list_for_each_entry(e, &evict_list, link) { err =3D drm_mm_reserve_node(mm, &e->node); if (err) { - pr_err("Failed to reinsert node after eviction: start=3D%llx\n", + KUNIT_FAIL(test, "Failed to reinsert node after eviction: start=3D%llx\= n", e->node.start); return err; } } =20 - if (!assert_continuous(mm, nodes[0].node.size)) { - pr_err("range is no longer continuous\n"); + if (!assert_continuous(test, mm, nodes[0].node.size)) { + KUNIT_FAIL(test, "range is no longer continuous\n"); return -EINVAL; } =20 return 0; } =20 -static int igt_evict(void *ignored) +static void igt_mm_evict(struct kunit *test) { DRM_RND_STATE(prng, random_seed); const unsigned int size =3D 8192; @@ -1524,7 +1393,6 @@ static int igt_evict(void *ignored) struct evict_node *nodes; struct drm_mm_node *node, *next; unsigned int *order, n; - int ret, err; =20 /* Here we populate a full drm_mm and then try and insert a new node * by evicting other nodes in a random order. The drm_mm_scan should @@ -1533,61 +1401,48 @@ static int igt_evict(void *ignored) * sizes to try and stress the hole finder. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(size, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 order =3D drm_random_order(size, &prng); if (!order) goto err_nodes; =20 - ret =3D -EINVAL; drm_mm_init(&mm, 0, size); for (n =3D 0; n < size; n++) { - err =3D drm_mm_insert_node(&mm, &nodes[n].node, 1); - if (err) { - pr_err("insert failed, step %d\n", n); - ret =3D err; + if (drm_mm_insert_node(&mm, &nodes[n].node, 1)) { + KUNIT_FAIL(test, "insert failed, step %d\n", n); goto out; } } =20 /* First check that using the scanner doesn't break the mm */ - if (!evict_nothing(&mm, size, nodes)) { - pr_err("evict_nothing() failed\n"); + if (!evict_nothing(test, &mm, size, nodes)) { + KUNIT_FAIL(test, "evict_nothing() failed\n"); goto out; } - if (!evict_everything(&mm, size, nodes)) { - pr_err("evict_everything() failed\n"); + if (!evict_everything(test, &mm, size, nodes)) { + KUNIT_FAIL(test, "evict_everything() failed\n"); goto out; } =20 for (mode =3D evict_modes; mode->name; mode++) { for (n =3D 1; n <=3D size; n <<=3D 1) { drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, 0, U64_MAX, - nodes, order, size, - n, 1, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u) failed\n", + if (evict_something(test, &mm, 0, U64_MAX, nodes, order, size, n, 1, mo= de)) { + KUNIT_FAIL(test, "%s evict_something(size=3D%u) failed\n", mode->name, n); - ret =3D err; goto out; } } =20 for (n =3D 1; n < size; n <<=3D 1) { drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, 0, U64_MAX, - nodes, order, size, - size/2, n, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u, alignment=3D%u) failed\n", - mode->name, size/2, n); - ret =3D err; + if (evict_something(test, &mm, 0, U64_MAX, nodes, order, size, + size/2, n, mode)) { + KUNIT_FAIL(test, + "%s evict_something(size=3D%u, alignment=3D%u) failed\n", + mode->name, size/2, n); goto out; } } @@ -1598,14 +1453,10 @@ static int igt_evict(void *ignored) DRM_MM_BUG_ON(!nsize); =20 drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, 0, U64_MAX, - nodes, order, size, - nsize, n, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u, alignment=3D%u) failed\n", - mode->name, nsize, n); - ret =3D err; + if (evict_something(test, &mm, 0, U64_MAX, nodes, order, size, + nsize, n, mode)) { + KUNIT_FAIL(test, "%s evict_something(size=3D%u, alignment=3D%u) failed= \n", + mode->name, nsize, n); goto out; } } @@ -1613,7 +1464,6 @@ static int igt_evict(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); @@ -1621,11 +1471,9 @@ static int igt_evict(void *ignored) kfree(order); err_nodes: vfree(nodes); -err: - return ret; } =20 -static int igt_evict_range(void *ignored) +static void igt_mm_evict_range(struct kunit *test) { DRM_RND_STATE(prng, random_seed); const unsigned int size =3D 8192; @@ -1637,28 +1485,22 @@ static int igt_evict_range(void *ignored) struct evict_node *nodes; struct drm_mm_node *node, *next; unsigned int *order, n; - int ret, err; =20 /* Like igt_evict() but now we are limiting the search to a * small portion of the full drm_mm. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(size, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 order =3D drm_random_order(size, &prng); if (!order) goto err_nodes; =20 - ret =3D -EINVAL; drm_mm_init(&mm, 0, size); for (n =3D 0; n < size; n++) { - err =3D drm_mm_insert_node(&mm, &nodes[n].node, 1); - if (err) { - pr_err("insert failed, step %d\n", n); - ret =3D err; + if (drm_mm_insert_node(&mm, &nodes[n].node, 1)) { + KUNIT_FAIL(test, "insert failed, step %d\n", n); goto out; } } @@ -1666,26 +1508,22 @@ static int igt_evict_range(void *ignored) for (mode =3D evict_modes; mode->name; mode++) { for (n =3D 1; n <=3D range_size; n <<=3D 1) { drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, range_start, range_end, - nodes, order, size, - n, 1, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u) failed with range [%u, %u]\n", - mode->name, n, range_start, range_end); + if (evict_something(test, &mm, range_start, range_end, nodes, + order, size, n, 1, mode)) { + KUNIT_FAIL(test, + "%s evict_something(size=3D%u) failed with range [%u, %u]\n", + mode->name, n, range_start, range_end); goto out; } } =20 for (n =3D 1; n <=3D range_size; n <<=3D 1) { drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, range_start, range_end, - nodes, order, size, - range_size/2, n, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u, alignment=3D%u) failed with rang= e [%u, %u]\n", - mode->name, range_size/2, n, range_start, range_end); + if (evict_something(test, &mm, range_start, range_end, nodes, + order, size, range_size/2, n, mode)) { + KUNIT_FAIL(test, + "%s evict_something(size=3D%u, alignment=3D%u) failed with range [= %u, %u]\n", + mode->name, range_size/2, n, range_start, range_end); goto out; } } @@ -1696,13 +1534,11 @@ static int igt_evict_range(void *ignored) DRM_MM_BUG_ON(!nsize); =20 drm_random_reorder(order, size, &prng); - err =3D evict_something(&mm, range_start, range_end, - nodes, order, size, - nsize, n, - mode); - if (err) { - pr_err("%s evict_something(size=3D%u, alignment=3D%u) failed with rang= e [%u, %u]\n", - mode->name, nsize, n, range_start, range_end); + if (evict_something(test, &mm, range_start, range_end, nodes, + order, size, nsize, n, mode)) { + KUNIT_FAIL(test, + "%s evict_something(size=3D%u, alignment=3D%u) failed with range [= %u, %u]\n", + mode->name, nsize, n, range_start, range_end); goto out; } } @@ -1710,7 +1546,6 @@ static int igt_evict_range(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); @@ -1718,8 +1553,6 @@ static int igt_evict_range(void *ignored) kfree(order); err_nodes: vfree(nodes); -err: - return ret; } =20 static unsigned int node_index(const struct drm_mm_node *node) @@ -1727,7 +1560,7 @@ static unsigned int node_index(const struct drm_mm_no= de *node) return div64_u64(node->start, node->size); } =20 -static int igt_topdown(void *ignored) +static void igt_mm_topdown(struct kunit *test) { const struct insert_mode *topdown =3D &insert_modes[TOPDOWN]; DRM_RND_STATE(prng, random_seed); @@ -1737,17 +1570,14 @@ static int igt_topdown(void *ignored) struct drm_mm mm; struct drm_mm_node *nodes, *node, *next; unsigned int *order, n, m, o =3D 0; - int ret; =20 /* When allocating top-down, we expect to be returned a node * from a suitable hole at the top of the drm_mm. We check that * the returned node does match the highest available slot. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(count, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 bitmap =3D bitmap_zalloc(count, GFP_KERNEL); if (!bitmap) @@ -1757,28 +1587,26 @@ static int igt_topdown(void *ignored) if (!order) goto err_bitmap; =20 - ret =3D -EINVAL; for (size =3D 1; size <=3D 64; size <<=3D 1) { drm_mm_init(&mm, 0, size*count); for (n =3D 0; n < count; n++) { - if (!expect_insert(&mm, &nodes[n], - size, 0, n, - topdown)) { - pr_err("insert failed, size %u step %d\n", size, n); + if (!expect_insert(test, &mm, &nodes[n], size, 0, n, topdown)) { + KUNIT_FAIL(test, "insert failed, size %u step %d\n", size, n); goto out; } =20 if (drm_mm_hole_follows(&nodes[n])) { - pr_err("hole after topdown insert %d, start=3D%llx\n, size=3D%u", - n, nodes[n].start, size); + KUNIT_FAIL(test, + "hole after topdown insert %d, start=3D%llx\n, size=3D%u", + n, nodes[n].start, size); goto out; } =20 - if (!assert_one_hole(&mm, 0, size*(count - n - 1))) + if (!assert_one_hole(test, &mm, 0, size*(count - n - 1))) goto out; } =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 drm_random_reorder(order, count, &prng); @@ -1793,23 +1621,23 @@ static int igt_topdown(void *ignored) unsigned int last; =20 node =3D &nodes[order[(o + m) % count]]; - if (!expect_insert(&mm, node, - size, 0, 0, - topdown)) { - pr_err("insert failed, step %d/%d\n", m, n); + if (!expect_insert(test, &mm, node, size, 0, 0, topdown)) { + KUNIT_FAIL(test, "insert failed, step %d/%d\n", m, n); goto out; } =20 if (drm_mm_hole_follows(node)) { - pr_err("hole after topdown insert %d/%d, start=3D%llx\n", - m, n, node->start); + KUNIT_FAIL(test, + "hole after topdown insert %d/%d, start=3D%llx\n", + m, n, node->start); goto out; } =20 last =3D find_last_bit(bitmap, count); if (node_index(node) !=3D last) { - pr_err("node %d/%d, size %d, not inserted into upmost hole, expected = %d, found %d\n", - m, n, size, last, node_index(node)); + KUNIT_FAIL(test, + "node %d/%d, size %d, not inserted into upmost hole, expected %d,= found %d\n", + m, n, size, last, node_index(node)); goto out; } =20 @@ -1827,7 +1655,6 @@ static int igt_topdown(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); @@ -1837,11 +1664,9 @@ static int igt_topdown(void *ignored) bitmap_free(bitmap); err_nodes: vfree(nodes); -err: - return ret; } =20 -static int igt_bottomup(void *ignored) +static void igt_mm_bottomup(struct kunit *test) { const struct insert_mode *bottomup =3D &insert_modes[BOTTOMUP]; DRM_RND_STATE(prng, random_seed); @@ -1851,16 +1676,13 @@ static int igt_bottomup(void *ignored) struct drm_mm mm; struct drm_mm_node *nodes, *node, *next; unsigned int *order, n, m, o =3D 0; - int ret; =20 /* Like igt_topdown, but instead of searching for the last hole, * we search for the first. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(count, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 bitmap =3D bitmap_zalloc(count, GFP_KERNEL); if (!bitmap) @@ -1870,22 +1692,20 @@ static int igt_bottomup(void *ignored) if (!order) goto err_bitmap; =20 - ret =3D -EINVAL; for (size =3D 1; size <=3D 64; size <<=3D 1) { drm_mm_init(&mm, 0, size*count); for (n =3D 0; n < count; n++) { - if (!expect_insert(&mm, &nodes[n], - size, 0, n, - bottomup)) { - pr_err("bottomup insert failed, size %u step %d\n", size, n); + if (!expect_insert(test, &mm, &nodes[n], size, 0, n, bottomup)) { + KUNIT_FAIL(test, + "bottomup insert failed, size %u step %d\n", size, n); goto out; } =20 - if (!assert_one_hole(&mm, size*(n + 1), size*count)) + if (!assert_one_hole(test, &mm, size*(n + 1), size*count)) goto out; } =20 - if (!assert_continuous(&mm, size)) + if (!assert_continuous(test, &mm, size)) goto out; =20 drm_random_reorder(order, count, &prng); @@ -1900,17 +1720,16 @@ static int igt_bottomup(void *ignored) unsigned int first; =20 node =3D &nodes[order[(o + m) % count]]; - if (!expect_insert(&mm, node, - size, 0, 0, - bottomup)) { - pr_err("insert failed, step %d/%d\n", m, n); + if (!expect_insert(test, &mm, node, size, 0, 0, bottomup)) { + KUNIT_FAIL(test, "insert failed, step %d/%d\n", m, n); goto out; } =20 first =3D find_first_bit(bitmap, count); if (node_index(node) !=3D first) { - pr_err("node %d/%d not inserted into bottom hole, expected %d, found = %d\n", - m, n, first, node_index(node)); + KUNIT_FAIL(test, + "node %d/%d not inserted into bottom hole, expected %d, found %d\= n", + m, n, first, node_index(node)); goto out; } __clear_bit(first, bitmap); @@ -1927,7 +1746,6 @@ static int igt_bottomup(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); @@ -1937,47 +1755,39 @@ static int igt_bottomup(void *ignored) bitmap_free(bitmap); err_nodes: vfree(nodes); -err: - return ret; } =20 -static int __igt_once(unsigned int mode) +static void __igt_once(struct kunit *test, unsigned int mode) { struct drm_mm mm; struct drm_mm_node rsvd_lo, rsvd_hi, node; - int err; =20 drm_mm_init(&mm, 0, 7); =20 memset(&rsvd_lo, 0, sizeof(rsvd_lo)); rsvd_lo.start =3D 1; rsvd_lo.size =3D 1; - err =3D drm_mm_reserve_node(&mm, &rsvd_lo); - if (err) { - pr_err("Could not reserve low node\n"); + if (drm_mm_reserve_node(&mm, &rsvd_lo)) { + KUNIT_FAIL(test, "Could not reserve low node\n"); goto err; } =20 memset(&rsvd_hi, 0, sizeof(rsvd_hi)); rsvd_hi.start =3D 5; rsvd_hi.size =3D 1; - err =3D drm_mm_reserve_node(&mm, &rsvd_hi); - if (err) { - pr_err("Could not reserve low node\n"); + if (drm_mm_reserve_node(&mm, &rsvd_hi)) { + KUNIT_FAIL(test, "Could not reserve low node\n"); goto err_lo; } =20 if (!drm_mm_hole_follows(&rsvd_lo) || !drm_mm_hole_follows(&rsvd_hi)) { - pr_err("Expected a hole after lo and high nodes!\n"); - err =3D -EINVAL; + KUNIT_FAIL(test, "Expected a hole after lo and high nodes!\n"); goto err_hi; } =20 memset(&node, 0, sizeof(node)); - err =3D drm_mm_insert_node_generic(&mm, &node, 2, 0, 0, mode); - if (err) { - pr_err("Could not insert the node into the available hole!\n"); - err =3D -EINVAL; + if (drm_mm_insert_node_generic(&mm, &node, 2, 0, 0, mode)) { + KUNIT_FAIL(test, "Could not insert the node into the available hole!\n"); goto err_hi; } =20 @@ -1988,23 +1798,20 @@ static int __igt_once(unsigned int mode) drm_mm_remove_node(&rsvd_lo); err: drm_mm_takedown(&mm); - return err; } =20 -static int igt_lowest(void *ignored) +static void igt_mm_lowest(struct kunit *test) { - return __igt_once(DRM_MM_INSERT_LOW); + __igt_once(test, DRM_MM_INSERT_LOW); } =20 -static int igt_highest(void *ignored) +static void igt_mm_highest(struct kunit *test) { - return __igt_once(DRM_MM_INSERT_HIGH); + __igt_once(test, DRM_MM_INSERT_HIGH); } =20 static void separate_adjacent_colors(const struct drm_mm_node *node, - unsigned long color, - u64 *start, - u64 *end) + unsigned long color, u64 *start, u64 *end) { if (drm_mm_node_allocated(node) && node->color !=3D color) ++*start; @@ -2014,11 +1821,11 @@ static void separate_adjacent_colors(const struct d= rm_mm_node *node, --*end; } =20 -static bool colors_abutt(const struct drm_mm_node *node) +static bool colors_abutt(struct kunit *test, const struct drm_mm_node *nod= e) { if (!drm_mm_hole_follows(node) && drm_mm_node_allocated(list_next_entry(node, node_list))) { - pr_err("colors abutt; %ld [%llx + %llx] is next to %ld [%llx + %llx]!\n", + KUNIT_FAIL(test, "colors abutt; %ld [%llx + %llx] is next to %ld [%llx += %llx]!\n", node->color, node->start, node->size, list_next_entry(node, node_list)->color, list_next_entry(node, node_list)->start, @@ -2029,14 +1836,13 @@ static bool colors_abutt(const struct drm_mm_node *= node) return false; } =20 -static int igt_color(void *ignored) +static void igt_mm_color(struct kunit *test) { const unsigned int count =3D min(4096u, max_iterations); const struct insert_mode *mode; struct drm_mm mm; struct drm_mm_node *node, *nn; unsigned int n; - int ret =3D -EINVAL, err; =20 /* Color adjustment complicates everything. First we just check * that when we insert a node we apply any color_adjustment callback. @@ -2050,14 +1856,11 @@ static int igt_color(void *ignored) for (n =3D 1; n <=3D count; n++) { node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { - ret =3D -ENOMEM; goto out; } =20 - if (!expect_insert(&mm, node, - n, 0, n, - &insert_modes[0])) { - pr_err("insert failed, step %d\n", n); + if (!expect_insert(test, &mm, node, n, 0, n, &insert_modes[0])) { + KUNIT_FAIL(test, "insert failed, step %d\n", n); kfree(node); goto out; } @@ -2065,7 +1868,7 @@ static int igt_color(void *ignored) =20 drm_mm_for_each_node_safe(node, nn, &mm) { if (node->color !=3D node->size) { - pr_err("invalid color stored: expected %lld, found %ld\n", + KUNIT_FAIL(test, "invalid color stored: expected %lld, found %ld\n", node->size, node->color); =20 goto out; @@ -2082,17 +1885,14 @@ static int igt_color(void *ignored) =20 node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { - ret =3D -ENOMEM; goto out; } =20 node->size =3D 1 + 2*count; node->color =3D node->size; =20 - err =3D drm_mm_reserve_node(&mm, node); - if (err) { - pr_err("initial reserve failed!\n"); - ret =3D err; + if (drm_mm_reserve_node(&mm, node)) { + KUNIT_FAIL(test, "initial reserve failed!\n"); goto out; } =20 @@ -2103,7 +1903,6 @@ static int igt_color(void *ignored) =20 node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { - ret =3D -ENOMEM; goto out; } =20 @@ -2111,10 +1910,8 @@ static int igt_color(void *ignored) node->size =3D n + count; node->color =3D node->size; =20 - err =3D drm_mm_reserve_node(&mm, node); - if (err !=3D -ENOSPC) { - pr_err("reserve %d did not report color overlap! err=3D%d\n", - n, err); + if (drm_mm_reserve_node(&mm, node) !=3D -ENOSPC) { + KUNIT_FAIL(test, "reserve %d did not report color overlap!", n); goto out; } =20 @@ -2122,10 +1919,8 @@ static int igt_color(void *ignored) rem =3D misalignment(node, n + count); node->start +=3D n + count - rem; =20 - err =3D drm_mm_reserve_node(&mm, node); - if (err) { - pr_err("reserve %d failed, err=3D%d\n", n, err); - ret =3D err; + if (drm_mm_reserve_node(&mm, node)) { + KUNIT_FAIL(test, "reserve %d failed", n); goto out; } =20 @@ -2135,15 +1930,11 @@ static int igt_color(void *ignored) for (n =3D 1; n <=3D count; n++) { node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { - ret =3D -ENOMEM; goto out; } =20 - if (!expect_insert(&mm, node, - n, n, n, - mode)) { - pr_err("%s insert failed, step %d\n", - mode->name, n); + if (!expect_insert(test, &mm, node, n, n, n, mode)) { + KUNIT_FAIL(test, "%s insert failed, step %d\n", mode->name, n); kfree(node); goto out; } @@ -2153,19 +1944,21 @@ static int igt_color(void *ignored) u64 rem; =20 if (node->color !=3D node->size) { - pr_err("%s invalid color stored: expected %lld, found %ld\n", - mode->name, node->size, node->color); + KUNIT_FAIL(test, + "%s invalid color stored: expected %lld, found %ld\n", + mode->name, node->size, node->color); =20 goto out; } =20 - if (colors_abutt(node)) + if (colors_abutt(test, node)) goto out; =20 div64_u64_rem(node->start, node->size, &rem); if (rem) { - pr_err("%s colored node misaligned, start=3D%llx expected alignment=3D= %lld [rem=3D%lld]\n", - mode->name, node->start, node->size, rem); + KUNIT_FAIL(test, + "%s colored node misaligned, start=3D%llx expected alignment=3D%ll= d [rem=3D%lld]\n", + mode->name, node->start, node->size, rem); goto out; } =20 @@ -2176,25 +1969,18 @@ static int igt_color(void *ignored) cond_resched(); } =20 - ret =3D 0; out: drm_mm_for_each_node_safe(node, nn, &mm) { drm_mm_remove_node(node); kfree(node); } drm_mm_takedown(&mm); - return ret; } =20 -static int evict_color(struct drm_mm *mm, - u64 range_start, u64 range_end, - struct evict_node *nodes, - unsigned int *order, - unsigned int count, - unsigned int size, - unsigned int alignment, - unsigned long color, - const struct insert_mode *mode) +static int evict_color(struct kunit *test, struct drm_mm *mm, u64 range_st= art, + u64 range_end, struct evict_node *nodes, unsigned int *order, + unsigned int count, unsigned int size, unsigned int alignment, + unsigned long color, const struct insert_mode *mode) { struct drm_mm_scan scan; LIST_HEAD(evict_list); @@ -2202,39 +1988,37 @@ static int evict_color(struct drm_mm *mm, struct drm_mm_node tmp; int err; =20 - drm_mm_scan_init_with_range(&scan, mm, - size, alignment, color, - range_start, range_end, - mode->mode); - if (!evict_nodes(&scan, - nodes, order, count, true, - &evict_list)) + drm_mm_scan_init_with_range(&scan, mm, size, alignment, color, range_star= t, + range_end, mode->mode); + if (!evict_nodes(test, &scan, nodes, order, count, true, &evict_list)) return -EINVAL; =20 memset(&tmp, 0, sizeof(tmp)); err =3D drm_mm_insert_node_generic(mm, &tmp, size, alignment, color, DRM_MM_INSERT_EVICT); if (err) { - pr_err("Failed to insert into eviction hole: size=3D%d, align=3D%d, colo= r=3D%lu, err=3D%d\n", - size, alignment, color, err); - show_scan(&scan); - show_holes(mm, 3); + KUNIT_FAIL(test, + "Failed to insert into eviction hole: size=3D%d, align=3D%d, color= =3D%lu, err=3D%d\n", + size, alignment, color, err); + show_scan(test, &scan); + show_holes(test, mm, 3); return err; } =20 if (tmp.start < range_start || tmp.start + tmp.size > range_end) { - pr_err("Inserted [address=3D%llu + %llu] did not fit into the request ra= nge [%llu, %llu]\n", - tmp.start, tmp.size, range_start, range_end); + KUNIT_FAIL(test, + "Inserted [address=3D%llu + %llu] did not fit into the request range= [%llu, %llu]\n", + tmp.start, tmp.size, range_start, range_end); err =3D -EINVAL; } =20 - if (colors_abutt(&tmp)) + if (colors_abutt(test, &tmp)) err =3D -EINVAL; =20 - if (!assert_node(&tmp, mm, size, alignment, color)) { - pr_err("Inserted did not fit the eviction hole: size=3D%lld [%d], align= =3D%d [rem=3D%lld], start=3D%llx\n", - tmp.size, size, - alignment, misalignment(&tmp, alignment), tmp.start); + if (!assert_node(test, &tmp, mm, size, alignment, color)) { + KUNIT_FAIL(test, + "Inserted did not fit the eviction hole: size=3D%lld [%d], align=3D%= d [rem=3D%lld], start=3D%llx\n", + tmp.size, size, alignment, misalignment(&tmp, alignment), tmp.start); err =3D -EINVAL; } =20 @@ -2245,7 +2029,7 @@ static int evict_color(struct drm_mm *mm, list_for_each_entry(e, &evict_list, link) { err =3D drm_mm_reserve_node(mm, &e->node); if (err) { - pr_err("Failed to reinsert node after eviction: start=3D%llx\n", + KUNIT_FAIL(test, "Failed to reinsert node after eviction: start=3D%llx\= n", e->node.start); return err; } @@ -2255,7 +2039,7 @@ static int evict_color(struct drm_mm *mm, return 0; } =20 -static int igt_color_evict(void *ignored) +static void igt_mm_color_evict(struct kunit *test) { DRM_RND_STATE(prng, random_seed); const unsigned int total_size =3D min(8192u, max_iterations); @@ -2265,7 +2049,6 @@ static int igt_color_evict(void *ignored) struct evict_node *nodes; struct drm_mm_node *node, *next; unsigned int *order, n; - int ret, err; =20 /* Check that the drm_mm_scan also honours color adjustment when * choosing its victims to create a hole. Our color_adjust does not @@ -2273,23 +2056,20 @@ static int igt_color_evict(void *ignored) * enlarging the set of victims that must be evicted. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(total_size, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 order =3D drm_random_order(total_size, &prng); if (!order) goto err_nodes; =20 - ret =3D -EINVAL; drm_mm_init(&mm, 0, 2*total_size - 1); mm.color_adjust =3D separate_adjacent_colors; for (n =3D 0; n < total_size; n++) { - if (!expect_insert(&mm, &nodes[n].node, + if (!expect_insert(test, &mm, &nodes[n].node, 1, 0, color++, &insert_modes[0])) { - pr_err("insert failed, step %d\n", n); + KUNIT_FAIL(test, "insert failed, step %d\n", n); goto out; } } @@ -2297,25 +2077,18 @@ static int igt_color_evict(void *ignored) for (mode =3D evict_modes; mode->name; mode++) { for (n =3D 1; n <=3D total_size; n <<=3D 1) { drm_random_reorder(order, total_size, &prng); - err =3D evict_color(&mm, 0, U64_MAX, - nodes, order, total_size, - n, 1, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u) failed\n", - mode->name, n); + if (evict_color(test, &mm, 0, U64_MAX, nodes, order, total_size, + n, 1, color++, mode)) { + KUNIT_FAIL(test, "%s evict_color(size=3D%u) failed\n", mode->name, n); goto out; } } =20 for (n =3D 1; n < total_size; n <<=3D 1) { drm_random_reorder(order, total_size, &prng); - err =3D evict_color(&mm, 0, U64_MAX, - nodes, order, total_size, - total_size/2, n, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u, alignment=3D%u) failed\n", + if (evict_color(test, &mm, 0, U64_MAX, nodes, order, total_size, + total_size/2, n, color++, mode)) { + KUNIT_FAIL(test, "%s evict_color(size=3D%u, alignment=3D%u) failed\n", mode->name, total_size/2, n); goto out; } @@ -2327,12 +2100,9 @@ static int igt_color_evict(void *ignored) DRM_MM_BUG_ON(!nsize); =20 drm_random_reorder(order, total_size, &prng); - err =3D evict_color(&mm, 0, U64_MAX, - nodes, order, total_size, - nsize, n, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u, alignment=3D%u) failed\n", + if (evict_color(test, &mm, 0, U64_MAX, nodes, order, total_size, + nsize, n, color++, mode)) { + KUNIT_FAIL(test, "%s evict_color(size=3D%u, alignment=3D%u) failed\n", mode->name, nsize, n); goto out; } @@ -2341,21 +2111,16 @@ static int igt_color_evict(void *ignored) cond_resched(); } =20 - ret =3D 0; out: - if (ret) - show_mm(&mm); drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); drm_mm_takedown(&mm); kfree(order); err_nodes: vfree(nodes); -err: - return ret; } =20 -static int igt_color_evict_range(void *ignored) +static void igt_mm_color_evict_range(struct kunit *test) { DRM_RND_STATE(prng, random_seed); const unsigned int total_size =3D 8192; @@ -2368,29 +2133,25 @@ static int igt_color_evict_range(void *ignored) struct evict_node *nodes; struct drm_mm_node *node, *next; unsigned int *order, n; - int ret, err; =20 /* Like igt_color_evict(), but limited to small portion of the full * drm_mm range. */ =20 - ret =3D -ENOMEM; nodes =3D vzalloc(array_size(total_size, sizeof(*nodes))); - if (!nodes) - goto err; + KUNIT_ASSERT_TRUE(test, nodes); =20 order =3D drm_random_order(total_size, &prng); if (!order) goto err_nodes; =20 - ret =3D -EINVAL; drm_mm_init(&mm, 0, 2*total_size - 1); mm.color_adjust =3D separate_adjacent_colors; for (n =3D 0; n < total_size; n++) { - if (!expect_insert(&mm, &nodes[n].node, + if (!expect_insert(test, &mm, &nodes[n].node, 1, 0, color++, &insert_modes[0])) { - pr_err("insert failed, step %d\n", n); + KUNIT_FAIL(test, "insert failed, step %d\n", n); goto out; } } @@ -2398,26 +2159,21 @@ static int igt_color_evict_range(void *ignored) for (mode =3D evict_modes; mode->name; mode++) { for (n =3D 1; n <=3D range_size; n <<=3D 1) { drm_random_reorder(order, range_size, &prng); - err =3D evict_color(&mm, range_start, range_end, - nodes, order, total_size, - n, 1, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u) failed for range [%x, %x]\n", - mode->name, n, range_start, range_end); + if (evict_color(test, &mm, range_start, range_end, nodes, order, + total_size, n, 1, color++, mode)) { + KUNIT_FAIL(test, "%s evict_color(size=3D%u) failed for range [%x, %x]\= n", + mode->name, n, range_start, range_end); goto out; } } =20 for (n =3D 1; n < range_size; n <<=3D 1) { drm_random_reorder(order, total_size, &prng); - err =3D evict_color(&mm, range_start, range_end, - nodes, order, total_size, - range_size/2, n, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u, alignment=3D%u) failed for range [%x= , %x]\n", - mode->name, total_size/2, n, range_start, range_end); + if (evict_color(test, &mm, range_start, range_end, nodes, order, + total_size, range_size/2, n, color++, mode)) { + KUNIT_FAIL(test, + "%s evict_color(size=3D%u, alignment=3D%u) failed for range [%x, %= x]\n", + mode->name, total_size/2, n, range_start, range_end); goto out; } } @@ -2428,13 +2184,11 @@ static int igt_color_evict_range(void *ignored) DRM_MM_BUG_ON(!nsize); =20 drm_random_reorder(order, total_size, &prng); - err =3D evict_color(&mm, range_start, range_end, - nodes, order, total_size, - nsize, n, color++, - mode); - if (err) { - pr_err("%s evict_color(size=3D%u, alignment=3D%u) failed for range [%x= , %x]\n", - mode->name, nsize, n, range_start, range_end); + if (evict_color(test, &mm, range_start, range_end, nodes, order, + total_size, nsize, n, color++, mode)) { + KUNIT_FAIL(test, + "%s evict_color(size=3D%u, alignment=3D%u) failed for range [%x, %= x]\n", + mode->name, nsize, n, range_start, range_end); goto out; } } @@ -2442,46 +2196,57 @@ static int igt_color_evict_range(void *ignored) cond_resched(); } =20 - ret =3D 0; out: - if (ret) - show_mm(&mm); drm_mm_for_each_node_safe(node, next, &mm) drm_mm_remove_node(node); drm_mm_takedown(&mm); kfree(order); err_nodes: vfree(nodes); -err: - return ret; } =20 -#include "drm_selftest.c" - -static int __init test_drm_mm_init(void) +static int drm_mm_init_test(struct kunit *test) { - int err; - while (!random_seed) random_seed =3D get_random_int(); =20 - pr_info("Testing DRM range manager (struct drm_mm), with random_seed=3D0x= %x max_iterations=3D%u max_prime=3D%u\n", - random_seed, max_iterations, max_prime); - err =3D run_selftests(selftests, ARRAY_SIZE(selftests), NULL); - - return err > 0 ? 0 : err; -} - -static void __exit test_drm_mm_exit(void) -{ + return 0; } =20 -module_init(test_drm_mm_init); -module_exit(test_drm_mm_exit); - module_param(random_seed, uint, 0400); module_param(max_iterations, uint, 0400); module_param(max_prime, uint, 0400); =20 +static struct kunit_case drm_mm_tests[] =3D { + KUNIT_CASE(igt_mm_init), + KUNIT_CASE(igt_mm_debug), + KUNIT_CASE(igt_mm_reserve), + KUNIT_CASE(igt_mm_insert), + KUNIT_CASE(igt_mm_replace), + KUNIT_CASE(igt_mm_insert_range), + KUNIT_CASE(igt_mm_frag), + KUNIT_CASE(igt_mm_align), + KUNIT_CASE(igt_mm_align32), + KUNIT_CASE(igt_mm_align64), + KUNIT_CASE(igt_mm_evict), + KUNIT_CASE(igt_mm_evict_range), + KUNIT_CASE(igt_mm_topdown), + KUNIT_CASE(igt_mm_bottomup), + KUNIT_CASE(igt_mm_lowest), + KUNIT_CASE(igt_mm_highest), + KUNIT_CASE(igt_mm_color), + KUNIT_CASE(igt_mm_color_evict), + KUNIT_CASE(igt_mm_color_evict_range), + {} +}; + +static struct kunit_suite drm_mm_test_suite =3D { + .name =3D "drm_mm_tests", + .init =3D drm_mm_init_test, + .test_cases =3D drm_mm_tests, +}; + +kunit_test_suite(drm_mm_test_suite); + MODULE_AUTHOR("Intel Corporation"); MODULE_LICENSE("GPL"); --=20 2.36.1