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().

Reviewed-by: Liviu Dudau <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>
---
Cc: Liviu Dudau <[email protected]>
---
 drivers/gpu/drm/arm/hdlcd_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index f2bf9a61979d..8c48549abf11 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -316,11 +316,13 @@ static int hdlcd_probe(struct platform_device *pdev)
        if (hdlcd_read(hdlcd, HDLCD_REG_COMMAND)) {
                hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
                aperture_remove_all_conflicting_devices(hdlcd_driver.name);
        }
 
-       drm_mode_config_reset(drm);
+       ret = drm_mode_config_create_initial_state(drm);
+       if (ret)
+               goto err_vblank;
        drm_kms_helper_poll_init(drm);
 
 #ifdef CONFIG_DEBUG_FS
        drm_debugfs_add_files(drm, hdlcd_debugfs_list, 
ARRAY_SIZE(hdlcd_debugfs_list));
 #endif

-- 
2.56.1

Reply via email to