Re: [PATCH v5 16/19] drm/mode-config: Create drm_mode_config_create_initial_state()

[Thomas Zimmermann <tzimmermann@suse.de>]

Am 19.05.26 um 11:01 schrieb Maxime Ripard:
> drm_mode_config_reset() can be used to create the initial state, but
> also to return to the initial state, when doing a suspend/resume cycle
> for example.
>
> It also affects both the software and the hardware, and drivers can
> choose to reset the hardware as well. Most will just create an empty
> state and the synchronisation between hardware and software states will
> effectively be done when the first commit is done.
>
> That dual role can be harmful, since some objects do need to be
> initialized but also need to be preserved across a suspend/resume cycle.
> drm_private_obj are such objects for example.
>
> Thus, create another helper for drivers to call to initialize their
> state when the driver is loaded, so we can make
> drm_mode_config_reset() only about handling suspend/resume and similar.
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Signed-off-by: Maxime Ripard <mripard@kernel.org>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

There are some notes on the style of writing below.

> ---
>   drivers/gpu/drm/drm_atomic.c      | 13 +++++-
>   drivers/gpu/drm/drm_mode_config.c | 89 +++++++++++++++++++++++++++++++++++++++
>   include/drm/drm_mode_config.h     |  1 +
>   3 files changed, 101 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index d98586d89bbe..ea021250925c 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -59,12 +59,21 @@
>    * preparing the update and kept alive as long as they are active in the
>    * device.
>    *
>    * Their respective lifetimes are:
>    *
> - * - at reset time, the object reset implementation will allocate a new
> - *   default state and will store it in the object state pointer.
> + * - at driver initialization time, the driver will call
> + *   drm_mode_config_create_initial_state() to allocate an initial,
> + *   pristine, state for each object and will store it in the objects

Present form: 'the driver calls', 'and stores it'.

> + *   state pointer. Historically, this was one of
> + *   drm_mode_config_reset() job, so one might still encounter it in a
> + *   driver.
> + *
> + * - at reset time, for example during suspend/resume,

Are there other reset times?  If not, then rather say

"- when resuming from suspend, drm_mode_config_reset() resets..."

> + *   drm_mode_config_reset() will reset the software and hardware state
> + *   to a known default and will store it in the object's state pointer.

Present form.

Best regards
Thomas

> + *   Not all objects are affected by drm_mode_config_reset() though.
>    *
>    * - whenever a new update is needed:
>    *
>    *   + A new &struct drm_atomic_commit is allocated using
>    *     drm_atomic_commit_alloc().
> diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
> index 9d240817f8b6..f432f485a914 100644
> --- a/drivers/gpu/drm/drm_mode_config.c
> +++ b/drivers/gpu/drm/drm_mode_config.c
> @@ -21,10 +21,11 @@
>    */
>   
>   #include <linux/export.h>
>   #include <linux/uaccess.h>
>   
> +#include <drm/drm_atomic.h>
>   #include <drm/drm_drv.h>
>   #include <drm/drm_encoder.h>
>   #include <drm/drm_file.h>
>   #include <drm/drm_framebuffer.h>
>   #include <drm/drm_managed.h>
> @@ -314,10 +315,98 @@ void drm_mode_config_reset(struct drm_device *dev)
>   	}
>   	drm_connector_list_iter_end(&conn_iter);
>   }
>   EXPORT_SYMBOL(drm_mode_config_reset);
>   
> +/**
> + * drm_mode_config_create_initial_state - Allocates the initial state
> + * @dev: drm device
> + *
> + * This functions creates the initial state for all the objects. Drivers
> + * can use this in e.g. probe to initialize their software state.
> + *
> + * It has two main differences with drm_mode_config_reset(): the reset()
> + * hooks aren't called and thus the hardware will be left untouched, but
> + * also the &drm_private_obj structures will be initialized as opposed
> + * to drm_mode_config_reset() that skips them.
> + *
> + * Returns: 0 on success, negative error value on failure.
> + */
> +int drm_mode_config_create_initial_state(struct drm_device *dev)
> +{
> +	struct drm_crtc *crtc;
> +	struct drm_colorop *colorop;
> +	struct drm_plane *plane;
> +	struct drm_connector *connector;
> +	struct drm_connector_list_iter conn_iter;
> +	struct drm_private_obj *privobj;
> +	int ret;
> +
> +	drm_for_each_privobj(privobj, dev) {
> +		struct drm_private_state *privobj_state;
> +
> +		if (privobj->state)
> +			continue;
> +
> +		if (!privobj->funcs->atomic_create_state)
> +			continue;
> +
> +		privobj_state = privobj->funcs->atomic_create_state(privobj);
> +		if (IS_ERR(privobj_state))
> +			return PTR_ERR(privobj_state);
> +
> +		privobj->state = privobj_state;
> +	}
> +
> +	drm_for_each_colorop(colorop, dev) {
> +		struct drm_colorop_state *colorop_state;
> +
> +		if (colorop->state)
> +			continue;
> +
> +		colorop_state = drm_atomic_helper_colorop_create_state(colorop);
> +		if (IS_ERR(colorop_state))
> +			return PTR_ERR(colorop_state);
> +
> +		colorop->state = colorop_state;
> +	}
> +
> +	drm_for_each_plane(plane, dev) {
> +		if (plane->state)
> +			continue;
> +
> +		ret = drm_mode_config_plane_create_state(plane);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	drm_for_each_crtc(crtc, dev) {
> +		if (crtc->state)
> +			continue;
> +
> +		ret = drm_mode_config_crtc_create_state(crtc);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	drm_connector_list_iter_begin(dev, &conn_iter);
> +	drm_for_each_connector_iter(connector, &conn_iter) {
> +		if (connector->state)
> +			continue;
> +
> +		ret = drm_mode_config_connector_create_state(connector);
> +		if (ret) {
> +			drm_connector_list_iter_end(&conn_iter);
> +			return ret;
> +		}
> +	}
> +	drm_connector_list_iter_end(&conn_iter);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL(drm_mode_config_create_initial_state);
> +
>   /*
>    * Global properties
>    */
>   static const struct drm_prop_enum_list drm_plane_type_enum_list[] = {
>   	{ DRM_PLANE_TYPE_OVERLAY, "Overlay" },
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index e584652ddf67..d8f5b7e9673e 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -1005,9 +1005,10 @@ int __must_check drmm_mode_config_init(struct drm_device *dev);
>   static inline int drm_mode_config_init(struct drm_device *dev)
>   {
>   	return drmm_mode_config_init(dev);
>   }
>   
> +int drm_mode_config_create_initial_state(struct drm_device *dev);
>   void drm_mode_config_reset(struct drm_device *dev);
>   void drm_mode_config_cleanup(struct drm_device *dev);
>   
>   #endif
>

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)