Skip to content

Commit 526aafa

Browse files
committed
drm/tests: Handle EDEADLK in set_up_atomic_state()
Fedora/CentOS/RHEL CI is reporting intermittent failures while running the drm_validate_modeset test [1]: # drm_test_check_connector_changed_modeset: EXPECTATION FAILED at # drivers/gpu/drm/tests/drm_atomic_state_test.c:162 Expected ret == 0, but ret == -35 (0xffffffffffffffdd) Change the set_up_atomic_state() helper function to return on error and restart the atomic sequence when the returned error is EDEADLK. [1] https://s3.amazonaws.com/arr-cki-prod-trusted-artifacts/trusted-artifacts/2106744096/test_x86_64/11762450343/artifacts/jobwatch/logs/recipes/19797909/tasks/204139142/results/945095586/logs/dmesg.log Fixes: 73d934d ("drm/tests: Add test for drm_atomic_helper_commit_modeset_disables()") Closes: https://datawarehouse.cki-project.org/issue/4004 Reviewed-by: Maxime Ripard <mripard@kernel.org> Signed-off-by: José Expósito <jose.exposito89@gmail.com> Link: https://patch.msgid.link/20251104102535.12212-2-jose.exposito89@gmail.com
1 parent 141d95e commit 526aafa

1 file changed

Lines changed: 22 additions & 5 deletions

File tree

drivers/gpu/drm/tests/drm_atomic_state_test.c

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,29 @@ static int set_up_atomic_state(struct kunit *test,
156156

157157
if (connector) {
158158
conn_state = drm_atomic_get_connector_state(state, connector);
159-
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
159+
if (IS_ERR(conn_state))
160+
return PTR_ERR(conn_state);
160161

161162
ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
162-
KUNIT_EXPECT_EQ(test, ret, 0);
163+
if (ret)
164+
return ret;
163165
}
164166

165167
crtc_state = drm_atomic_get_crtc_state(state, crtc);
166-
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
168+
if (IS_ERR(crtc_state))
169+
return PTR_ERR(crtc_state);
167170

168171
ret = drm_atomic_set_mode_for_crtc(crtc_state, &drm_atomic_test_mode);
169-
KUNIT_EXPECT_EQ(test, ret, 0);
172+
if (ret)
173+
return ret;
170174

171175
crtc_state->enable = true;
172176
crtc_state->active = true;
173177

174178
if (connector) {
175179
ret = drm_atomic_commit(state);
176-
KUNIT_ASSERT_EQ(test, ret, 0);
180+
if (ret)
181+
return ret;
177182
} else {
178183
// dummy connector mask
179184
crtc_state->connector_mask = DRM_TEST_CONN_0;
@@ -206,7 +211,13 @@ static void drm_test_check_connector_changed_modeset(struct kunit *test)
206211
drm_modeset_acquire_init(&ctx, 0);
207212

208213
// first modeset to enable
214+
retry_set_up:
209215
ret = set_up_atomic_state(test, priv, old_conn, &ctx);
216+
if (ret == -EDEADLK) {
217+
ret = drm_modeset_backoff(&ctx);
218+
if (!ret)
219+
goto retry_set_up;
220+
}
210221
KUNIT_ASSERT_EQ(test, ret, 0);
211222

212223
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -277,7 +288,13 @@ static void drm_test_check_valid_clones(struct kunit *test)
277288

278289
drm_modeset_acquire_init(&ctx, 0);
279290

291+
retry_set_up:
280292
ret = set_up_atomic_state(test, priv, NULL, &ctx);
293+
if (ret == -EDEADLK) {
294+
ret = drm_modeset_backoff(&ctx);
295+
if (!ret)
296+
goto retry_set_up;
297+
}
281298
KUNIT_ASSERT_EQ(test, ret, 0);
282299

283300
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

0 commit comments

Comments
 (0)