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: Dave Airlie <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
 drivers/gpu/drm/qxl/qxl_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/qxl/qxl_display.c 
b/drivers/gpu/drm/qxl/qxl_display.c
index 77fbf3c864cc..361265a0d620 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1310,11 +1310,14 @@ int qxl_modeset_init(struct qxl_device *qdev)
 
        ret = drm_vblank_init(&qdev->ddev, qxl_num_crtc);
        if (ret)
                goto destroy_monitors_object;
 
-       drm_mode_config_reset(&qdev->ddev);
+       ret = drm_mode_config_create_initial_state(&qdev->ddev);
+       if (ret)
+               goto destroy_monitors_object;
+
        return 0;
 
 destroy_monitors_object:
        qxl_destroy_monitors_object(qdev);
        return ret;

-- 
2.56.1

Reply via email to