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: Paul Kocialkowski <[email protected]>
---
 drivers/gpu/drm/logicvc/logicvc_mode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c 
b/drivers/gpu/drm/logicvc/logicvc_mode.c
index 3cf04b70bd27..15503f96743f 100644
--- a/drivers/gpu/drm/logicvc/logicvc_mode.c
+++ b/drivers/gpu/drm/logicvc/logicvc_mode.c
@@ -59,11 +59,13 @@ int logicvc_mode_init(struct logicvc_drm *logicvc)
        mode_config->min_height = 1;
        mode_config->max_height = 2048;
        mode_config->preferred_depth = preferred_depth;
        mode_config->funcs = &logicvc_mode_config_funcs;
 
-       drm_mode_config_reset(drm_dev);
+       ret = drm_mode_config_create_initial_state(drm_dev);
+       if (ret)
+               return ret;
 
        drm_kms_helper_poll_init(drm_dev);
 
        return 0;
 }

-- 
2.56.1

Reply via email to