drm_mode_config_reset() has a dual role: it creates the initial KMS state at probe time, and resets hardware and software state during suspend/resume cycles.
Since the two roles need different behaviors (notably for objects like drm_private_obj that must persist across suspend/resume), drm_mode_config_create_initial_state() was introduced to handle only the initial state creation at probe time. Switch to drm_mode_config_create_initial_state(). Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/tests/drm_bridge_test.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/tests/drm_bridge_test.c index 15583ade8494..f56209c0ab1c 100644 --- a/drivers/gpu/drm/tests/drm_bridge_test.c +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -423,5 +423,7 @@ drm_test_bridge_init(struct kunit *test, const struct drm_bridge_funcs *funcs) return ERR_CAST(priv->connector); - drm_mode_config_reset(drm); + ret = drm_mode_config_create_initial_state(drm); + if (ret) + return ERR_PTR(ret); return priv; @@ -521,5 +523,7 @@ drm_test_bridge_chain_init(struct kunit *test, unsigned int num_bridges, drm_connector_attach_encoder(priv->connector, enc); - drm_mode_config_reset(drm); + ret = drm_mode_config_create_initial_state(drm); + if (ret) + return ERR_PTR(ret); if (!has_hdmi) @@ -613,5 +617,7 @@ drm_test_bridge_hdmi_init(struct kunit *test, const struct drm_bridge_funcs *fun drm_connector_attach_encoder(priv->connector, enc); - drm_mode_config_reset(drm); + ret = drm_mode_config_create_initial_state(drm); + if (ret) + return ERR_PTR(ret); return priv; -- 2.55.0
