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: Jonathan Hunter <[email protected]> Cc: Mikko Perttunen <[email protected]> Cc: Thierry Reding <[email protected]> Cc: [email protected] --- drivers/gpu/drm/tegra/drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 324480c87fb1..9fdb9e70eb0a 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1246,5 +1246,7 @@ static int host1x_drm_probe(struct host1x_device *dev) goto hub; - drm_mode_config_reset(drm); + err = drm_mode_config_create_initial_state(drm); + if (err) + goto hub; /* -- 2.55.0
