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: Javier Martinez Canillas <[email protected]> --- drivers/gpu/drm/sysfb/efidrm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c index 8b19f437308e..bfdf6d07ab1e 100644 --- a/drivers/gpu/drm/sysfb/efidrm.c +++ b/drivers/gpu/drm/sysfb/efidrm.c @@ -364,5 +364,7 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv, return ERR_PTR(ret); - drm_mode_config_reset(dev); + ret = drm_mode_config_create_initial_state(dev); + if (ret) + return ERR_PTR(ret); return efi; -- 2.55.0
