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: Liviu Dudau <[email protected]>
---
 drivers/gpu/drm/arm/malidp_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 23fa942ae4bb..b4e38eba5957 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -857,5 +857,7 @@ static int malidp_bind(struct device *dev)
        pm_runtime_put(dev);
 
-       drm_mode_config_reset(drm);
+       ret = drm_mode_config_create_initial_state(drm);
+       if (ret)
+               goto register_fail;
 
        drm_kms_helper_poll_init(drm);

-- 
2.55.0

Reply via email to