From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Maxime Ripard <mripard@kernel.org>
Cc: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Jonathan Corbet" <corbet@lwn.net>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@oss.qualcomm.com>,
"Jyri Sarha" <jyri.sarha@iki.fi>,
"Tomi Valkeinen" <tomi.valkeinen@ideasonboard.com>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Robert Foss" <rfoss@kernel.org>,
"Jonas Karlman" <jonas@kwiboo.se>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Simon Ser" <contact@emersion.fr>,
"Harry Wentland" <harry.wentland@amd.com>,
"Melissa Wen" <mwen@igalia.com>,
"Sebastian Wick" <sebastian.wick@redhat.com>,
"Alex Hung" <alex.hung@amd.com>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Tvrtko Ursulin" <tursulin@ursulin.net>,
"Chen-Yu Tsai" <wens@kernel.org>,
"Samuel Holland" <samuel@sholland.org>,
"Dave Stevenson" <dave.stevenson@raspberrypi.com>,
"Maíra Canal" <mcanal@igalia.com>,
"Raspberry Pi Kernel Maintenance" <kernel-list@raspberrypi.com>,
dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Daniel Stone" <daniels@collabora.com>,
intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Subject: Re: [PATCH v3 16/20] drm/mode-config: Create drm_mode_config_create_initial_state()
Date: Mon, 4 May 2026 20:41:48 +0300 [thread overview]
Message-ID: <20260504174148.GS1344263@killaraus.ideasonboard.com> (raw)
In-Reply-To: <20260424-drm-mode-config-init-v3-16-8b68d9db0d8b@kernel.org>
On Fri, Apr 24, 2026 at 12:18:56PM +0200, Maxime Ripard wrote:
> 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>
> Signed-off-by: Maxime Ripard <mripard@kernel.org>
> ---
> drivers/gpu/drm/drm_atomic.c | 12 +++++-
> drivers/gpu/drm/drm_mode_config.c | 87 +++++++++++++++++++++++++++++++++++++++
> include/drm/drm_mode_config.h | 1 +
> 3 files changed, 98 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 253a00f450b0..f31b6147e682 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -59,12 +59,20 @@
> * when 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 allocate an initial,
> + * pristine, state and will store it using
> + * drm_mode_config_create_initial_state().
I think it's useful to keep documented where the state is stored.
* - at driver initialization time, the driver will call
* drm_mode_config_create_initial_state() to allocate an initial, pristine,
* state and store in the object 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,
> + * 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.
> + * Not all objects are affected by drm_mode_config_reset() though.
Does the reset implementation store a new state in the object's state
pointer, or does it reset the contents of the already allocated state ?
I read the documentation here as meaning the former, if it's actually
the latter it should be reworded.
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> *
> * - whenever a new update is needed:
> *
> * + A new &struct drm_atomic_state is allocated using
> * drm_atomic_state_alloc().
> diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
> index 92ff907f2485..a43eb825671b 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>
> @@ -281,10 +282,96 @@ 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
s/Allocates/Allocate/
> + * @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)
> + 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 687c0ee163d2..00009250fde4 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
>
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2026-05-04 17:41 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-24 10:18 [PATCH v3 00/20] drm/atomic: Rework initial state allocation Maxime Ripard
2026-04-24 10:18 ` [PATCH v3 01/20] drm/atomic: Document atomic state lifetime Maxime Ripard
2026-05-04 16:26 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 02/20] drm/colorop: Fix typos in the doc Maxime Ripard
2026-05-04 16:27 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 03/20] drm/atomic: Drop drm_private_obj.state assignment from create_state Maxime Ripard
2026-05-04 16:33 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 04/20] drm/atomic: Expand atomic_create_state expectations for drm_private_obj Maxime Ripard
2026-05-04 16:34 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 05/20] drm/mode-config: Document drm_private_obj exclusion from drm_mode_config_reset() Maxime Ripard
2026-04-24 10:18 ` [PATCH v3 06/20] drm/colorop: Rename __drm_colorop_state_reset() Maxime Ripard
2026-05-04 16:36 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 07/20] drm/colorop: Create drm_atomic_helper_colorop_create_state() Maxime Ripard
2026-05-04 16:41 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 08/20] drm/atomic-state-helper: Fix __drm_atomic_helper_plane_reset() doc typo Maxime Ripard
2026-04-24 10:18 ` [PATCH v3 09/20] drm/atomic-state-helper: Rename __drm_atomic_helper_plane_state_reset() Maxime Ripard
2026-05-04 16:42 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 10/20] drm/plane: Add new atomic_create_state callback Maxime Ripard
2026-05-04 16:52 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 11/20] drm/atomic-state-helper: Rename __drm_atomic_helper_crtc_state_reset() Maxime Ripard
2026-05-04 16:53 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 12/20] drm/crtc: Add new atomic_create_state callback Maxime Ripard
2026-05-04 17:28 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 13/20] drm/atomic-state-helper: Rename __drm_atomic_helper_connector_state_reset() Maxime Ripard
2026-05-04 17:30 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 14/20] drm/hdmi: Rename __drm_atomic_helper_connector_hdmi_reset() Maxime Ripard
2026-05-04 17:32 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 15/20] drm/connector: Add new atomic_create_state callback Maxime Ripard
2026-05-04 17:35 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 16/20] drm/mode-config: Create drm_mode_config_create_initial_state() Maxime Ripard
2026-05-04 17:41 ` Laurent Pinchart [this message]
2026-04-24 10:18 ` [PATCH v3 17/20] drm/drv: Switch skeleton to drm_mode_config_create_initial_state() Maxime Ripard
2026-05-04 18:02 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 18/20] drm/tidss: Switch " Maxime Ripard
2026-05-04 17:49 ` Laurent Pinchart
2026-04-24 10:18 ` [PATCH v3 19/20] drm/tidss: Convert to atomic_create_state Maxime Ripard
2026-04-24 10:19 ` [PATCH v3 20/20] drm/bridge_connector: " Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260504174148.GS1344263@killaraus.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=andrzej.hajda@intel.com \
--cc=contact@emersion.fr \
--cc=corbet@lwn.net \
--cc=daniels@collabora.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jyri.sarha@iki.fi \
--cc=kernel-list@raspberrypi.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mcanal@igalia.com \
--cc=mripard@kernel.org \
--cc=mwen@igalia.com \
--cc=neil.armstrong@linaro.org \
--cc=rfoss@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=samuel@sholland.org \
--cc=sebastian.wick@redhat.com \
--cc=simona@ffwll.ch \
--cc=skhan@linuxfoundation.org \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=tursulin@ursulin.net \
--cc=tzimmermann@suse.de \
--cc=wens@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox