On Mo, 2026-11-16 at 11:30 +0100, Maxime Ripard wrote:
> 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: Fabio Estevam <[email protected]>
> Cc: Frank Li <[email protected]>
> Cc: Pengutronix Kernel Team <[email protected]>
> Cc: Philipp Zabel <[email protected]>
> Cc: Sascha Hauer <[email protected]>
> Cc: [email protected]
> ---
>  drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c 
> b/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
> index 51a0ec043248..b7b6ae8f9578 100644
> --- a/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
> +++ b/drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
> @@ -242,11 +242,13 @@ static int imx_drm_bind(struct device *dev)
>       /* Now try and bind all our sub-components */
>       ret = component_bind_all(dev, drm);
>       if (ret)
>               goto err_kms;
>  
> -     drm_mode_config_reset(drm);
> +     ret = drm_mode_config_create_initial_state(drm);
> +     if (ret)
> +             goto err_poll_fini;

This is ok because drm_kms_helper_poll_fini() just returns when
drm_kms_helper_poll_init() hasn't been called yet.

Still, I think it would be clearer to add a err_mode_config goto target
between drm_kms_helper_poll_fini() and component_unbind_all().

>       /*
>        * All components are now initialised, so setup the fb helper.
>        * The fb helper takes copies of key hardware information, so the
>        * crtcs/connectors/encoders must not change after this point.

Either way,

Reviewed-by: Philipp Zabel <[email protected]>

regards
Philipp

Reply via email to