* [PATCH 00/60] drm/plane: Convert all drivers to atomic_create_state and remove reset
@ 2026-07-09 11:50 Maxime Ripard
2026-07-09 11:51 ` [PATCH 59/60] drm/tegra: Convert to atomic_create_state Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2026-07-09 11:50 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter
Cc: dri-devel, Maxime Ripard, javierm, ikerpedrosam, admin,
gargaditya08, hamohammed.sa, louis.chauvet, melissa.srw,
alexander.deucher, amd-gfx, christian.koenig, liviu.dudau,
alison.wang, stefan, jstultz, sumit.semwal, xinliang.liu,
yongqin.liu, Frank.Li, Sascha Hauer, festevam, imx, kernel,
victor.liu, l.stach, laurentiu.palcu, linux-mips, paul,
anitha.chrisanthus, paulk, chenhuacai, jeffbai, lvjianmin,
wuqianhai, xry111, zhengxingda, jbrunet, khilman, linux-amlogic,
martin.blumenstingl, abhinav.kumar, freedreno, jesszhan0024,
linux-arm-msm, lumag, marijn.suijten, robin.clark, sean, marex,
airlied, kraxel, spice-devel, virtualization, andy.yan, heiko,
hjc, linux-rockchip, Baolin Wang, orsonzhai, zhang.lyra,
alain.volmat, rgallaispou, alexandre.torgue, mcoquelin.stm32,
philippe.cornu, raphael.gallais-pou, yannick.fertre, linux-sunxi,
samuel, wens, jyri.sarha, tomi.valkeinen, hansg, dmitry.osipenko,
gurchetansingh, olvaffe, michal.simek, harry.wentland, siqueira,
sunpeng.li, linux, alexandre.belloni, claudiu.beznea, dharma.b,
manikandan.m, nicolas.ferre, alim.akhtar, inki.dae, krzk,
kyungmin.park, linux-samsung-soc, sw0312.kim, p.zabel,
angelogioacchino.delregno, chunkuang.hu, matthias.bgg, dakr,
lyude, nouveau, geert+renesas, kieran.bingham+renesas,
laurent.pinchart+renesas, linux-renesas-soc, magnus.damm,
tomi.valkeinen+renesas, biju.das.jz, dave.stevenson, kernel-list,
mcanal, bcm-kernel-feedback-list, zack.rusin, jonathanh,
linux-tegra, mperttunen, thierry.reding
This is a follow-up to the bridge reset removal series, and part of a
larger effort to remove the reset hook from all KMS objects.
The plane reset hook is overloaded: it is called both at probe time
to create the initial software state and during suspend/resume to
reset hardware and software state. These two roles have different
requirements, and the reset hook is not fallible, making error
handling difficult for the initial state allocation path.
While reset has the semantics to reset both the software and hardware
state, the vast majority of implementations and all the helpers only
reset the software state, making them equivalent to
atomic_create_state in practice. The atomic_create_state hook makes
this explicit: it only allocates and initializes a pristine state
without any side effect, and returns the state pointer or an ERR_PTR
on failure.
This series first adds the necessary infrastructure in the simple-kms
and GEM atomic helpers, then converts all 51 plane drivers tree-wide
from the reset hook to atomic_create_state. The conversions were done
using a combination of Coccinelle semantic patches and manual
adjustments. Once all drivers are converted, the old helpers and the
reset hook itself are removed from struct drm_plane_funcs.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
Maxime Ripard (60):
drm/simple-kms: Add create_plane_state hook
drm/gem-atomic-helper: Create drm_gem_create_shadow_plane_state()
drm/gem-atomic-helper: Convert simple-kms shadow helpers to create_plane_state
drm/gem-atomic-helper: Switch DRM_GEM_SHADOW_PLANE_FUNCS to atomic_create_state
drm/gem-atomic-helper: Remove drm_gem_reset_shadow_plane()
drm/sysfb: Convert to atomic_create_state
drm/simple-kms: Switch to atomic_create_state
drm/ssd130x: Convert to atomic_create_state
drm/st7920: Convert to atomic_create_state
drm/appletbdrm: Convert to atomic_create_state
drm/vkms: Convert to atomic_create_state
drm/gem-atomic-helper: Remove __drm_gem_reset_shadow_plane()
drm/amdgpu: Convert to atomic_create_state
drm/hdlcd: Convert to atomic_create_state
drm/fsl-dcu: Convert to atomic_create_state
drm/hisilicon/kirin: Convert to atomic_create_state
drm/imx/dc: Convert to atomic_create_state
drm/imx/dcss: Convert to atomic_create_state
drm/ingenic: Convert to atomic_create_state
drm/kmb: Convert to atomic_create_state
drm/logicvc: Convert to atomic_create_state
drm/loongson: Convert to atomic_create_state
drm/meson: Convert to atomic_create_state
drm/msm/mdp4: Convert to atomic_create_state
drm/lcdif: Convert to atomic_create_state
drm/mxsfb: Convert to atomic_create_state
drm/qxl: Convert to atomic_create_state
drm/rockchip: Convert to atomic_create_state
drm/sprd: Convert to atomic_create_state
drm/sti: Convert to atomic_create_state
drm/stm: Convert to atomic_create_state
drm/sun4i: sun8i: Convert to atomic_create_state
drm/tests: kunit: Convert to atomic_create_state
drm/tilcdc: Convert to atomic_create_state
drm/vboxvideo: Convert to atomic_create_state
drm/virtio: Convert to atomic_create_state
drm/xlnx: Convert to atomic_create_state
drm/atomic-state-helper: Remove drm_atomic_helper_plane_reset()
drm/amdgpu_dm: Convert to atomic_create_state
drm/komeda: Convert to atomic_create_state
drm/malidp: Convert to atomic_create_state
drm/armada: Convert to atomic_create_state
drm/atmel-hlcdc: Convert to atomic_create_state
drm/exynos: Convert to atomic_create_state
drm/imx/ipuv3: Convert to atomic_create_state
drm/mediatek: Convert to atomic_create_state
drm/msm/dpu1: Convert to atomic_create_state
drm/msm/mdp5: Convert to atomic_create_state
drm/nouveau: Convert to atomic_create_state
drm/omap: Convert to atomic_create_state
drm/rcar-du: Convert to atomic_create_state
drm/rz-du: Convert to atomic_create_state
drm/shmobile: Convert to atomic_create_state
drm/sun4i: layer: Convert to atomic_create_state
drm/vc4: Convert to atomic_create_state
drm/verisilicon: Convert to atomic_create_state
drm/vmwgfx: Convert to atomic_create_state
drm/atomic-state-helper: Remove __drm_atomic_helper_plane_reset()
drm/tegra: Convert to atomic_create_state
drm/plane: Remove reset
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 17 ++--
drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 18 ++--
drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +-
drivers/gpu/drm/arm/malidp_planes.c | 12 ++-
drivers/gpu/drm/armada/armada_overlay.c | 39 ++++----
drivers/gpu/drm/armada/armada_plane.c | 15 ++--
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 27 +++---
drivers/gpu/drm/drm_atomic_state_helper.c | 41 ---------
drivers/gpu/drm/drm_gem_atomic_helper.c | 100 +++++++++++----------
drivers/gpu/drm/drm_mode_config.c | 4 +-
drivers/gpu/drm/drm_simple_kms_helper.c | 11 +--
drivers/gpu/drm/exynos/exynos_drm_plane.c | 22 ++---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +-
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +-
drivers/gpu/drm/imx/dc/dc-plane.c | 2 +-
drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 +-
drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 19 ++--
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +-
drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +-
drivers/gpu/drm/kmb/kmb_plane.c | 2 +-
drivers/gpu/drm/logicvc/logicvc_layer.c | 2 +-
drivers/gpu/drm/loongson/lsdc_plane.c | 2 +-
drivers/gpu/drm/mediatek/mtk_plane.c | 22 ++---
drivers/gpu/drm/meson/meson_overlay.c | 2 +-
drivers/gpu/drm/meson/meson_plane.c | 2 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 18 ++--
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +-
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 ++--
drivers/gpu/drm/mxsfb/lcdif_kms.c | 2 +-
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/wndw.c | 15 ++--
drivers/gpu/drm/omapdrm/omap_plane.c | 13 ++-
drivers/gpu/drm/qxl/qxl_display.c | 4 +-
drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c | 15 ++--
drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 15 ++--
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 15 ++--
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 15 ++--
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
drivers/gpu/drm/sitronix/st7920.c | 12 +--
drivers/gpu/drm/solomon/ssd130x.c | 12 +--
drivers/gpu/drm/sprd/sprd_dpu.c | 2 +-
drivers/gpu/drm/sti/sti_cursor.c | 2 +-
drivers/gpu/drm/sti/sti_gdp.c | 2 +-
drivers/gpu/drm/sti/sti_hqvdp.c | 2 +-
drivers/gpu/drm/stm/ltdc.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_layer.c | 12 ++-
drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +-
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +-
drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 4 +-
drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 30 +++++--
drivers/gpu/drm/tegra/plane.c | 28 +++---
drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +-
drivers/gpu/drm/tiny/appletbdrm.c | 12 +--
drivers/gpu/drm/vboxvideo/vbox_mode.c | 2 +-
drivers/gpu/drm/vc4/vc4_plane.c | 15 ++--
drivers/gpu/drm/verisilicon/vs_cursor_plane.c | 2 +-
drivers/gpu/drm/verisilicon/vs_plane.c | 14 ++-
drivers/gpu/drm/verisilicon/vs_plane.h | 2 +-
drivers/gpu/drm/verisilicon/vs_primary_plane.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +-
drivers/gpu/drm/vkms/vkms_plane.c | 15 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 17 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +-
drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +-
include/drm/drm_atomic_state_helper.h | 3 -
include/drm/drm_gem_atomic_helper.h | 13 +--
include/drm/drm_plane.h | 12 ---
include/drm/drm_simple_kms_helper.h | 1 +
74 files changed, 331 insertions(+), 422 deletions(-)
---
base-commit: 671b7825dbfe9ea6e3ad3001003aeee0df48d1b5
change-id: 20260629-drm-no-more-plane-reset-04950f42e07f
Best regards,
--
Maxime Ripard <mripard@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 59/60] drm/tegra: Convert to atomic_create_state
2026-07-09 11:50 [PATCH 00/60] drm/plane: Convert all drivers to atomic_create_state and remove reset Maxime Ripard
@ 2026-07-09 11:51 ` Maxime Ripard
2026-07-15 7:25 ` Mikko Perttunen
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2026-07-09 11:51 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter
Cc: dri-devel, Maxime Ripard, jonathanh, linux-tegra, mperttunen,
thierry.reding
The plane reset implementation creates a custom state subclass, but
only initializes a pristine state without resetting any hardware. This
is equivalent to what atomic_create_state expects. Convert to it.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
Cc: jonathanh@nvidia.com
Cc: linux-tegra@vger.kernel.org
Cc: mperttunen@nvidia.com
Cc: thierry.reding@kernel.org
---
drivers/gpu/drm/tegra/plane.c | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
index 0cb30910773f..2148b0c59815 100644
--- a/drivers/gpu/drm/tegra/plane.c
+++ b/drivers/gpu/drm/tegra/plane.c
@@ -22,32 +22,28 @@ static void tegra_plane_destroy(struct drm_plane *plane)
drm_plane_cleanup(plane);
kfree(p);
}
-static void tegra_plane_reset(struct drm_plane *plane)
+static struct drm_plane_state *tegra_plane_atomic_create_state(struct drm_plane *plane)
{
struct tegra_plane *p = to_tegra_plane(plane);
struct tegra_plane_state *state;
unsigned int i;
- if (plane->state)
- __drm_atomic_helper_plane_destroy_state(plane->state);
-
- kfree(plane->state);
- plane->state = NULL;
-
state = kzalloc_obj(*state);
- if (state) {
- plane->state = &state->base;
- plane->state->plane = plane;
- plane->state->zpos = p->index;
- plane->state->normalized_zpos = p->index;
+ if (!state)
+ return ERR_PTR(-ENOMEM);
- for (i = 0; i < 3; i++)
- state->iova[i] = DMA_MAPPING_ERROR;
- }
+ state->base.plane = plane;
+ state->base.zpos = p->index;
+ state->base.normalized_zpos = p->index;
+
+ for (i = 0; i < 3; i++)
+ state->iova[i] = DMA_MAPPING_ERROR;
+
+ return &state->base;
}
static struct drm_plane_state *
tegra_plane_atomic_duplicate_state(struct drm_plane *plane)
{
@@ -129,11 +125,11 @@ static bool tegra_plane_format_mod_supported(struct drm_plane *plane,
const struct drm_plane_funcs tegra_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.destroy = tegra_plane_destroy,
- .reset = tegra_plane_reset,
+ .atomic_create_state = tegra_plane_atomic_create_state,
.atomic_duplicate_state = tegra_plane_atomic_duplicate_state,
.atomic_destroy_state = tegra_plane_atomic_destroy_state,
.format_mod_supported = tegra_plane_format_mod_supported,
};
--
2.54.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 59/60] drm/tegra: Convert to atomic_create_state
2026-07-09 11:51 ` [PATCH 59/60] drm/tegra: Convert to atomic_create_state Maxime Ripard
@ 2026-07-15 7:25 ` Mikko Perttunen
0 siblings, 0 replies; 3+ messages in thread
From: Mikko Perttunen @ 2026-07-15 7:25 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
Maxime Ripard
Cc: dri-devel, Maxime Ripard, jonathanh, linux-tegra, thierry.reding
On Thursday, July 9, 2026 8:51 PM Maxime Ripard wrote:
> The plane reset implementation creates a custom state subclass, but
> only initializes a pristine state without resetting any hardware. This
> is equivalent to what atomic_create_state expects. Convert to it.
>
> Signed-off-by: Maxime Ripard <mripard@kernel.org>
> ---
> Cc: jonathanh@nvidia.com
> Cc: linux-tegra@vger.kernel.org
> Cc: mperttunen@nvidia.com
> Cc: thierry.reding@kernel.org
> ---
> drivers/gpu/drm/tegra/plane.c | 28 ++++++++++++----------------
> 1 file changed, 12 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
> index 0cb30910773f..2148b0c59815 100644
> --- a/drivers/gpu/drm/tegra/plane.c
> +++ b/drivers/gpu/drm/tegra/plane.c
> @@ -22,32 +22,28 @@ static void tegra_plane_destroy(struct drm_plane *plane)
>
> drm_plane_cleanup(plane);
> kfree(p);
> }
>
> -static void tegra_plane_reset(struct drm_plane *plane)
> +static struct drm_plane_state *tegra_plane_atomic_create_state(struct drm_plane *plane)
> {
> struct tegra_plane *p = to_tegra_plane(plane);
> struct tegra_plane_state *state;
> unsigned int i;
>
> - if (plane->state)
> - __drm_atomic_helper_plane_destroy_state(plane->state);
> -
> - kfree(plane->state);
> - plane->state = NULL;
> -
> state = kzalloc_obj(*state);
> - if (state) {
> - plane->state = &state->base;
> - plane->state->plane = plane;
> - plane->state->zpos = p->index;
> - plane->state->normalized_zpos = p->index;
> + if (!state)
> + return ERR_PTR(-ENOMEM);
>
> - for (i = 0; i < 3; i++)
> - state->iova[i] = DMA_MAPPING_ERROR;
> - }
> + state->base.plane = plane;
> + state->base.zpos = p->index;
> + state->base.normalized_zpos = p->index;
> +
> + for (i = 0; i < 3; i++)
> + state->iova[i] = DMA_MAPPING_ERROR;
> +
> + return &state->base;
> }
>
> static struct drm_plane_state *
> tegra_plane_atomic_duplicate_state(struct drm_plane *plane)
> {
> @@ -129,11 +125,11 @@ static bool tegra_plane_format_mod_supported(struct drm_plane *plane,
>
> const struct drm_plane_funcs tegra_plane_funcs = {
> .update_plane = drm_atomic_helper_update_plane,
> .disable_plane = drm_atomic_helper_disable_plane,
> .destroy = tegra_plane_destroy,
> - .reset = tegra_plane_reset,
> + .atomic_create_state = tegra_plane_atomic_create_state,
> .atomic_duplicate_state = tegra_plane_atomic_duplicate_state,
> .atomic_destroy_state = tegra_plane_atomic_destroy_state,
> .format_mod_supported = tegra_plane_format_mod_supported,
> };
>
>
> --
> 2.54.0
>
>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-07-15 7:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-09 11:50 [PATCH 00/60] drm/plane: Convert all drivers to atomic_create_state and remove reset Maxime Ripard
2026-07-09 11:51 ` [PATCH 59/60] drm/tegra: Convert to atomic_create_state Maxime Ripard
2026-07-15 7:25 ` Mikko Perttunen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox