From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792677240; b=vbuFWDDDNS4P8ep4ypjvJqmsDzCDtLATQjEJRe0gmixhx9FzIxQKxZNSqYhyLWdLwRPq BHSHasxSV+uYCykESKNBxKEYyk4Ny6g8jjwPW7czBoWvQckJgRXNddiejmxZ8N9h58RUb Dlm8JguVhzUWH1aeeZoCNrKzAl5obCpnk6AIIIJVMm8KXv1rQLasnTphEROk19KBYuAjL TPno36K3DJ5HC3ruASIPuW+56key94ltUMryVmo47/fsALnLSbOh7KEMdGr5tbq3zYaGT 6Y6vXzGo4v2TpTX0lBBsBUvMUiKcA9DPxtahsnfVYyz0LpMltrjHPpgmX8buTTe6ILA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792677240; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=ETk4Vvue3fU+X6PlGrGoZ9V42eIY0XS1teM++7Pdk2E=; b=47NqLSQMPkuL7zTZNNyWKNFe6xzYkokWlu2o6HKdz2CsH8of4DTgzkppZ/C31Nt0ALJK na70eGyBub0qkxgoMrhMyG70NPprG8t9NVwyVu7NE4v6hSYgG+5iJj2H7w3fby5yxGF8v YQ5Kiwl/o0PED/wwzcyXUP5LcolVxzkbJI+TCkfDp8lAc3C2aD1HnKsplwnaivCNzarGX h9UewmPuvMeudziTzzYUkW0AuGBo+Fya1HFJwKe1nTQC28A5Fk7rnjzymmOX5uujCrL7T lFG3DNk8OXhXNAm7UdHPfFgxTSpgcOr/XnHscDe/JCPMzoOnvIw9myzNeMeuPuriX3w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=H5Kt+jEx; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58E9260A3802 for ; Thu, 22 Oct 2026 13:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=H5Kt+jEx Received: by smtp.kernel.org (Postfix) with ESMTPSA id 770D31F000C7; Thu, 22 Oct 2026 13:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792677240; bh=ETk4Vvue3fU+X6PlGrGoZ9V42eIY0XS1teM++7Pdk2E=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=H5Kt+jExLp0N6/BysEvwvyw1mpkHIuxwYcmXXT/QM4+jlvZttB3FXGiXtt0ufLHpw ZBFMD44OcFhfUx1d7uMhUu0I4d/wfQM2KQEabFO2l4jXq+0JQcAtmZHCsZhae/Y5hH FOP65+nYG62maKHjipRHU8LuucVJd1RWrHnDhh8sING5Pfxzi/AZ36PwyLA7PJ+B3Y fkfYM6KJI4oc87I9KE4IprgVrfTUy0Pjm0lOEFEfaCDlmlk2eEk7SCpwUvJGzEemM1 cDK93Eiyota0lsAGvtYAq2H4VAwLXyBQ59tIphmmmJ67QdyDMHGVZ1+sCFj6OW4n8Y p3nP26r7Fivqg== From: Maxime Ripard Date: Thu, 22 Oct 2026 15:53:13 +0200 Subject: [PATCH v6 12/15] drm/tests: atomic: Add tests for drm_atomic_commit_fill_with_defaults() X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261022-drm-reset-state-flag-v6-12-f36d640b7e76@kernel.org> References: <20261022-drm-reset-state-flag-v6-0-f36d640b7e76@kernel.org> In-Reply-To: <20261022-drm-reset-state-flag-v6-0-f36d640b7e76@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Daniel Stone , Harry Wentland , Jocelyn Falempe , =?utf-8?q?Jonas_=C3=85dahl?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Pekka Paalanen , Sebastian Wick , Simon Ser , Victoria Brekenfeld , Xaver Hugl , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard , Daniel Stone X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6082; i=mripard@kernel.org; h=from:subject:message-id; bh=lRDoTRql6Gy/qG1I/e8YQHUOPjq/mEfjtCmsWCffq7g=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFm3RD1WGp1doZKQ5HVETmZemlHZsu4nxm/fqHJOebtlo 9f5TWlyHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAigYyM9VVccrEz0+TFOpuv tRi9l+V8xlWzfc/flXc23FlZftq73pvDY9ItW9fvzRY3r18vXx4sxtiwbY4n38NzWeesmaskbW9 vWM80yd8zXqNji9JfdxYlM93imgMvtKare816d2Z9fPA7nssA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_commit_fill_with_defaults() is used by the DRM_MODE_ATOMIC_RESET flag to bring all objects back to their pristine state. However, it has no dedicated test coverage. Add two tests that verify the reset cycle. The first enables a CRTC, plane, and connector, then calls drm_atomic_commit_fill_with_defaults() and verifies all objects return to their disabled state: CRTC inactive, plane disabled with no framebuffer, and connector unbound. The second goes further and commits the default-filled state to verify the init -> enable -> reset -> commit sequence completes without errors. Suggested-by: Daniel Stone Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_atomic_test.c | 141 +++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_atomic_test.c b/drivers/gpu/drm/tests/drm_atomic_test.c index 0aca5c1bbeae..a8e21da811aa 100644 --- a/drivers/gpu/drm/tests/drm_atomic_test.c +++ b/drivers/gpu/drm/tests/drm_atomic_test.c @@ -143,5 +143,4 @@ static struct kunit_case drm_atomic_get_connector_for_encoder_tests[] = { }; - static struct kunit_suite drm_atomic_get_connector_for_encoder_test_suite = { .name = "drm_test_atomic_get_connector_for_encoder", @@ -149,5 +148,143 @@ static struct kunit_suite drm_atomic_get_connector_for_encoder_test_suite = { }; -kunit_test_suite(drm_atomic_get_connector_for_encoder_test_suite); +/* + * Test that after enabling a CRTC and connector, filling with defaults + * produces a state where all objects are disabled: CRTC is inactive, + * plane is disabled, and connector is unbound. + * + * This is done without any lease, so all objects are expected to be + * reset. + * + * The plane is not explicitly enabled with a framebuffer here, so + * this validates that fill_with_defaults produces a consistent + * disabled state rather than testing an active plane teardown. + */ +static void drm_test_check_fill_with_defaults(struct kunit *test) +{ + struct drm_atomic_test_priv *priv; + struct drm_modeset_acquire_ctx ctx; + struct drm_connector_state *new_conn_state; + struct drm_crtc_state *new_crtc_state; + struct drm_plane_state *new_plane_state; + struct drm_atomic_commit *state; + struct drm_display_mode *mode; + struct drm_device *drm; + int ret; + + priv = create_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm = &priv->drm; + + mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_enable: + ret = drm_kunit_helper_enable_crtc_connector(test, drm, + priv->crtc, + &priv->connector, + mode, &ctx); + if (ret == -EDEADLK) { + ret = drm_modeset_backoff(&ctx); + if (!ret) + goto retry_enable; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + + ret = drm_atomic_commit_fill_with_defaults(NULL, state); + KUNIT_ASSERT_EQ(test, ret, 0); + + new_crtc_state = drm_atomic_get_new_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_crtc_state); + KUNIT_EXPECT_FALSE(test, new_crtc_state->enable); + KUNIT_EXPECT_FALSE(test, new_crtc_state->active); + + new_plane_state = drm_atomic_get_new_plane_state(state, priv->plane); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_plane_state); + KUNIT_EXPECT_NULL(test, new_plane_state->crtc); + KUNIT_EXPECT_NULL(test, new_plane_state->fb); + + new_conn_state = drm_atomic_get_new_connector_state(state, &priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_conn_state); + KUNIT_EXPECT_NULL(test, new_conn_state->crtc); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test that after enabling a CRTC and connector, fill_with_defaults + * produces a state that can be successfully committed. + * + * This is done without any lease, so all objects are reset. + * + * The plane is not explicitly enabled with a framebuffer, so this + * validates that fill_with_defaults produces a consistent disabled + * state rather than testing an active plane teardown. + */ +static void drm_test_check_fill_with_defaults_commit(struct kunit *test) +{ + struct drm_atomic_test_priv *priv; + struct drm_modeset_acquire_ctx ctx; + struct drm_atomic_commit *state; + struct drm_display_mode *mode; + struct drm_device *drm; + int ret; + + priv = create_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm = &priv->drm; + + mode = drm_kunit_display_mode_from_cea_vic(test, drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_enable: + ret = drm_kunit_helper_enable_crtc_connector(test, drm, + priv->crtc, + &priv->connector, + mode, &ctx); + if (ret == -EDEADLK) { + ret = drm_modeset_backoff(&ctx); + if (!ret) + goto retry_enable; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + + ret = drm_atomic_commit_fill_with_defaults(NULL, state); + KUNIT_ASSERT_EQ(test, ret, 0); + + state->allow_modeset = true; + + ret = drm_atomic_commit(state); + KUNIT_EXPECT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +static struct kunit_case drm_atomic_fill_with_defaults_tests[] = { + KUNIT_CASE(drm_test_check_fill_with_defaults), + KUNIT_CASE(drm_test_check_fill_with_defaults_commit), + { } +}; + +static struct kunit_suite drm_atomic_fill_with_defaults_test_suite = { + .name = "drm_atomic_commit_fill_with_defaults", + .test_cases = drm_atomic_fill_with_defaults_tests, +}; + +kunit_test_suites(&drm_atomic_get_connector_for_encoder_test_suite, + &drm_atomic_fill_with_defaults_test_suite); MODULE_AUTHOR("Maxime Ripard "); -- 2.55.0