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: Geert Uytterhoeven <[email protected]> Cc: [email protected] --- drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c index fd9460da1789..4d3a714e255d 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c @@ -173,11 +173,13 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) ret = shmob_drm_connector_create(sdev, &sdev->encoder); if (ret < 0) return ret; - drm_mode_config_reset(dev); + ret = drm_mode_config_create_initial_state(dev); + if (ret) + return ret; drm_kms_helper_poll_init(dev); sdev->ddev.mode_config.min_width = 0; sdev->ddev.mode_config.min_height = 0; -- 2.56.1
