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(). Acked-by: Paul Cercueil <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> --- Cc: Paul Cercueil <[email protected]> Cc: [email protected] --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 6acb7d2f25b9..c73eeb95dd3d 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1362,11 +1362,13 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) ret = drmm_add_action_or_reset(drm, ingenic_drm_atomic_private_obj_fini, &priv->private_obj); if (ret) goto err_drvdata; - drm_mode_config_reset(drm); + ret = drm_mode_config_create_initial_state(drm); + if (ret) + goto err_drvdata; ret = clk_prepare_enable(priv->pix_clk); if (ret) { dev_err(dev, "Unable to start pixel clock\n"); goto err_drvdata; -- 2.56.1
