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: Anitha Chrisanthus <[email protected]>
---
 drivers/gpu/drm/kmb/kmb_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/kmb/kmb_drv.c b/drivers/gpu/drm/kmb/kmb_drv.c
index 7c2eb1152fc2..fc8ab5124bd6 100644
--- a/drivers/gpu/drm/kmb/kmb_drv.c
+++ b/drivers/gpu/drm/kmb/kmb_drv.c
@@ -196,12 +196,11 @@ static int kmb_setup_mode_config(struct drm_device *drm)
                drm_err(drm, "failed to initialize vblank\n");
                pm_runtime_disable(drm->dev);
                return ret;
        }
 
-       drm_mode_config_reset(drm);
-       return 0;
+       return drm_mode_config_create_initial_state(drm);
 }
 
 static irqreturn_t handle_lcd_irq(struct drm_device *dev)
 {
        unsigned long status, val, val1;

-- 
2.56.1

Reply via email to