From nobody Sun Dec 14 21:46:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABA4226771F for ; Thu, 13 Mar 2025 12:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867233; cv=none; b=VyKukSYbk0AHsQhOeaH3AeRneMFZhlu+R0g2B2F5r1/rqpFvS9XqpVEsnIxW5NCxlm4qvl2PIrXafvl8Sz7pxtGVRc8yZyFou9wm9h175lMUYwn2JD2h0+LhdlYmdQHqQQSvsyvmgiA7aOI/FzS6zaEgFqUwYDwyF2MTL5eYtPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867233; c=relaxed/simple; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fmgb9TJq25/0pTNci5x4naMSe+F6vTYzjVpUggFlxL/aWT8oD04Cz00tAlIohCi7g0JmuZnZXWKW0ccKvadN3xjJpo9qiI/QgYDJGobJt/iR/HESmyd9KUzjZJ/yWc0PlQMSu+muC84QQVgOSur9LHEuwknEVq2NrLFpKGWB68U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a5soXwnC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a5soXwnC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1867C4CEE5; Thu, 13 Mar 2025 12:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867233; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a5soXwnCczLmpg4oTe/g5Y5MRlkN3Msj2EGfegDT81/uckcYwgEUaswm/eVhqXYGD rdHHg+0ihE5Gx95GBuVmiy1TYoVypDk1Pi55HrySNuLRmH6PdFdKOq68gXnqPFt05J zZryHL87muFVqgFeA0UIg9NqdNeOQMY+Gp5/bXyB10nx5sHKZA2DyKvUpWOXCqb+Lh I2iW0NP7ebrcJtAJge17b0Nzq+UJkgKTOcWXR/ukkGAIcR5wReK4kyi8aTNKnwvQ5g 5ap2qT7mNYwRY6/GYfv/YUaxnYD8Sk6hLjQzEx5fNwv2eapeuSWDm+HRGOIeZqivMA ves/Ze/nbD5kA== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:01 +0100 Subject: [PATCH v6 07/16] drm/tests: Create tests for drm_atomic Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250313-bridge-connector-v6-7-511c54a604fb@kernel.org> References: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org> In-Reply-To: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Douglas Anderson Cc: Herve Codina , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5633; i=mripard@kernel.org; h=from:subject:message-id; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThza1tTP/HPWwWUSj9c/Np936Odq/priJJU93hHWL T55xtIaHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZjIsbWMDN/ti7ksvH62LcpO 0/6z9bzY1K+Hmu5OCpXz2p3whnfPxQCG/56f2kyTKtbM06nR7tv+63XXJjsdZ0eRrsXXTjexBaZ OYwMA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D We don't have a set of kunit tests for the functions under drm_atomic.h. Let's use the introduction of drm_atomic_get_connector_for_encoder() to create some tests for it and thus create that set. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/drm_atomic_test.c | 153 ++++++++++++++++++++++++++++= ++++ 2 files changed, 154 insertions(+) diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 6691c577d2d4581a4185bac2ce89a6b14b339b35..3afd6587df0831a0d10e91ff0a5= 84af6ba1813e4 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -2,10 +2,11 @@ =20 obj-$(CONFIG_DRM_KUNIT_TEST_HELPERS) +=3D \ drm_kunit_helpers.o =20 obj-$(CONFIG_DRM_KUNIT_TEST) +=3D \ + drm_atomic_test.o \ drm_atomic_state_test.o \ drm_bridge_test.o \ drm_buddy_test.o \ drm_cmdline_parser_test.o \ drm_connector_test.o \ diff --git a/drivers/gpu/drm/tests/drm_atomic_test.c b/drivers/gpu/drm/test= s/drm_atomic_test.c new file mode 100644 index 0000000000000000000000000000000000000000..ea91bec6569e688ad33149d8ee6= ecc3562b61254 --- /dev/null +++ b/drivers/gpu/drm/tests/drm_atomic_test.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Kunit test for drm_atomic functions + */ +#include +#include +#include +#include +#include +#include + +#include + +struct drm_atomic_test_priv { + struct drm_device drm; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_encoder encoder; + struct drm_connector connector; +}; + +static const struct drm_connector_helper_funcs drm_atomic_init_connector_h= elper_funcs =3D { +}; + +static const struct drm_connector_funcs drm_atomic_init_connector_funcs = =3D { + .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, + .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, + .reset =3D drm_atomic_helper_connector_reset, +}; + +static struct drm_atomic_test_priv *create_device(struct kunit *test) +{ + struct drm_atomic_test_priv *priv; + struct drm_connector *connector; + struct drm_encoder *enc; + struct drm_device *drm; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct device *dev; + int ret; + + dev =3D drm_kunit_helper_alloc_device(test); + if (IS_ERR(dev)) + return ERR_CAST(dev); + + priv =3D drm_kunit_helper_alloc_drm_device(test, dev, + struct drm_atomic_test_priv, drm, + DRIVER_MODESET | DRIVER_ATOMIC); + if (IS_ERR(priv)) + return ERR_CAST(priv); + + drm =3D &priv->drm; + plane =3D drm_kunit_helper_create_primary_plane(test, drm, + NULL, + NULL, + NULL, 0, + NULL); + if (IS_ERR(plane)) + return ERR_CAST(plane); + priv->plane =3D plane; + + crtc =3D drm_kunit_helper_create_crtc(test, drm, + plane, NULL, + NULL, + NULL); + if (IS_ERR(crtc)) + return ERR_CAST(crtc); + priv->crtc =3D crtc; + + enc =3D &priv->encoder; + ret =3D drmm_encoder_init(drm, enc, NULL, DRM_MODE_ENCODER_TMDS, NULL); + if (ret) + return ERR_PTR(ret); + + enc->possible_crtcs =3D drm_crtc_mask(crtc); + + connector =3D &priv->connector; + ret =3D drmm_connector_init(drm, connector, + &drm_atomic_init_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL, + NULL); + if (ret) + return ERR_PTR(ret); + + drm_connector_helper_add(connector, &drm_atomic_init_connector_helper_fun= cs); + + drm_connector_attach_encoder(connector, enc); + + drm_mode_config_reset(drm); + + return priv; +} + +static void drm_test_drm_atomic_get_connector_for_encoder(struct kunit *te= st) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_atomic_test_priv *priv; + struct drm_display_mode *mode; + struct drm_connector *curr_connector; + int ret; + + priv =3D create_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_enable: + ret =3D drm_kunit_helper_enable_crtc_connector(test, &priv->drm, + priv->crtc, &priv->connector, + mode, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_enable; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + drm_modeset_acquire_init(&ctx, 0); + +retry_conn: + curr_connector =3D drm_atomic_get_connector_for_encoder(&priv->encoder, + &ctx); + if (PTR_ERR(curr_connector) =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_conn; + } + KUNIT_EXPECT_PTR_EQ(test, curr_connector, &priv->connector); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +static struct kunit_case drm_atomic_get_connector_for_encoder_tests[] =3D { + KUNIT_CASE(drm_test_drm_atomic_get_connector_for_encoder), + { } +}; + + +static struct kunit_suite drm_atomic_get_connector_for_encoder_test_suite = =3D { + .name =3D "drm_test_atomic_get_connector_for_encoder", + .test_cases =3D drm_atomic_get_connector_for_encoder_tests, +}; + +kunit_test_suite(drm_atomic_get_connector_for_encoder_test_suite); + +MODULE_AUTHOR("Maxime Ripard "); +MODULE_DESCRIPTION("Kunit test for drm_atomic functions"); +MODULE_LICENSE("GPL"); --=20 2.48.1