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: Russell King <[email protected]>
---
 drivers/gpu/drm/armada/armada_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/armada/armada_drv.c 
b/drivers/gpu/drm/armada/armada_drv.c
index cae25ad66c74..5c19923c85b0 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -124,11 +124,13 @@ static int armada_drm_bind(struct device *dev)
 
        ret = drm_vblank_init(&priv->drm, priv->drm.mode_config.num_crtc);
        if (ret)
                goto err_comp;
 
-       drm_mode_config_reset(&priv->drm);
+       ret = drm_mode_config_create_initial_state(&priv->drm);
+       if (ret)
+               goto err_comp;
 
        drm_kms_helper_poll_init(&priv->drm);
 
        ret = drm_dev_register(&priv->drm, 0);
        if (ret)

-- 
2.56.1

Reply via email to