diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c index 353a261d42da..f8ae1a0bd5c0 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -2929,15 +2929,6 @@ retry_crtc_state: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_crtc_state; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state); @@ -3034,15 +3025,6 @@ retry_crtc_state: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_crtc_state; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state); @@ -3153,15 +3135,6 @@ retry_conn_state: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_conn_state; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state); @@ -3276,15 +3249,6 @@ retry_conn_state: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_conn_state; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state); @@ -3387,15 +3351,6 @@ retry_crtc_state: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_crtc_state; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state); @@ -3438,15 +3393,6 @@ retry_crtc_state_2: old_hdmi_update_failures = priv->hdmi_update_failures; - ret = drm_atomic_check_only(state); - if (ret == -EDEADLK) { - drm_atomic_commit_clear(state); - ret = drm_modeset_backoff(&ctx); - if (!ret) - goto retry_crtc_state_2; - } - KUNIT_ASSERT_EQ(test, ret, 0); - ret = drm_atomic_commit(state); if (ret == -EDEADLK) { drm_atomic_commit_clear(state);