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: David Lechner <[email protected]>
---
 drivers/gpu/drm/sitronix/st7735r.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/sitronix/st7735r.c 
b/drivers/gpu/drm/sitronix/st7735r.c
index bd763871dca0..e6c77b01dd38 100644
--- a/drivers/gpu/drm/sitronix/st7735r.c
+++ b/drivers/gpu/drm/sitronix/st7735r.c
@@ -336,5 +336,7 @@ static int st7735r_probe(struct spi_device *spi)
                return ret;
 
-       drm_mode_config_reset(drm);
+       ret = drm_mode_config_create_initial_state(drm);
+       if (ret)
+               return ret;
 
        ret = drm_dev_register(drm, 0);

-- 
2.55.0

Reply via email to