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: Jyri Sarha <[email protected]>
Cc: Tomi Valkeinen <[email protected]>
---
 drivers/gpu/drm/tidss/tidss_drv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tidss/tidss_drv.c 
b/drivers/gpu/drm/tidss/tidss_drv.c
index 44b0b009c29a..e258f656cf03 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.c
+++ b/drivers/gpu/drm/tidss/tidss_drv.c
@@ -167,5 +167,9 @@ static int tidss_probe(struct platform_device *pdev)
        drm_kms_helper_poll_init(ddev);
 
-       drm_mode_config_reset(ddev);
+       ret = drm_mode_config_create_initial_state(ddev);
+       if (ret) {
+               dev_err(dev, "failed to create initial state: %d\n", ret);
+               goto err_irq_uninstall;
+       }
 
        ret = drm_dev_register(ddev, 0);

-- 
2.55.0

Reply via email to