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]> --- Cc: Alexandre Torgue <[email protected]> Cc: Maxime Coquelin <[email protected]> Cc: Philippe Cornu <[email protected]> Cc: Raphael Gallais-Pou <[email protected]> Cc: Yannick Fertre <[email protected]> --- drivers/gpu/drm/stm/drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 0967b9b3451d..60343ffe02f7 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -105,5 +105,7 @@ static int drv_load(struct drm_device *ddev) return ret; - drm_mode_config_reset(ddev); + ret = drm_mode_config_create_initial_state(ddev); + if (ret) + return ret; drm_kms_helper_poll_init(ddev); -- 2.55.0
