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: Fabio Estevam <[email protected]> Cc: Frank Li <[email protected]> Cc: Liu Ying <[email protected]> Cc: Pengutronix Kernel Team <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: [email protected] --- drivers/gpu/drm/imx/dc/dc-kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/dc/dc-kms.c b/drivers/gpu/drm/imx/dc/dc-kms.c index 0e2ce6a42548..7e29b51e58fc 100644 --- a/drivers/gpu/drm/imx/dc/dc-kms.c +++ b/drivers/gpu/drm/imx/dc/dc-kms.c @@ -130,5 +130,7 @@ int dc_kms_init(struct dc_drm_device *dc_drm) } - drm_mode_config_reset(drm); + ret = drm_mode_config_create_initial_state(drm); + if (ret) + return ret; drm_kms_helper_poll_init(drm); -- 2.55.0
