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: Danilo Krummrich <[email protected]> Cc: Lyude Paul <[email protected]> Cc: [email protected] --- drivers/gpu/drm/nouveau/nouveau_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index d71dcfc6ee66..da07acea6a41 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -711,5 +711,7 @@ nouveau_display_create(struct drm_device *dev) goto disp_create_err; - drm_mode_config_reset(dev); + ret = drm_mode_config_create_initial_state(dev); + if (ret) + goto vblank_err; if (dev->mode_config.num_crtc) { -- 2.55.0
