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: "Heiko Stübner" <[email protected]> Cc: Andy Yan <[email protected]> Cc: Sandy Huang <[email protected]> Cc: [email protected] --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 3099408e9d05..1fc6134f6900 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -191,5 +191,7 @@ static int rockchip_drm_bind(struct device *dev) goto err_iommu_cleanup; - drm_mode_config_reset(drm_dev); + ret = drm_mode_config_create_initial_state(drm_dev); + if (ret) + goto err_iommu_cleanup; /* init kms poll for handling hpd */ -- 2.55.0
