* [PATCH v2 00/61] drm/plane: Convert all drivers to atomic_create_state and remove reset
@ 2026-08-14 14:56 Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 27/61] drm/qxl: Convert to atomic_create_state Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 37/61] drm/virtio: " Maxime Ripard
0 siblings, 2 replies; 3+ messages in thread
From: Maxime Ripard @ 2026-08-14 14:56 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter
Cc: dri-devel, Maxime Ripard, javierm, Iker Pedrosa, Aditya Garg,
admin, 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, Paul Cercueil, linux-mips,
anitha.chrisanthus, paulk, chenhuacai, jeffbai, lvjianmin,
wuqianhai, xry111, zhengxingda, Martin Blumenstingl, jbrunet,
khilman, linux-amlogic, Dmitry Baryshkov, 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, Dharma Balasubiramani, Ludovic Desroches,
Manikandan Muralidharan, alexandre.belloni, claudiu.beznea,
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,
Maíra Canal, dave.stevenson, kernel-list,
bcm-kernel-feedback-list, zack.rusin, Mikko Perttunen, jonathanh,
linux-tegra, 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>
---
Changes in v2:
- Rebase on latest drm-misc-next tag
- Fix sashiko reviews
- Fix atmel-hlcdc breakage
- Link to v1: https://lore.kernel.org/r/20260709-drm-no-more-plane-reset-v1-0-302d986fe5f0@kernel.org
---
Maxime Ripard (61):
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/verisilicon: 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: Drop spurious csc_init call from reset
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/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 | 26 +++---
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 | 18 ++--
drivers/gpu/drm/armada/armada_overlay.c | 39 ++++----
drivers/gpu/drm/armada/armada_plane.c | 15 ++--
drivers/gpu/drm/armada/armada_plane.h | 2 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 33 +++----
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 +
75 files changed, 343 insertions(+), 433 deletions(-)
---
base-commit: bd4f284df04d76fd65e57141cb1e6e7a49e4c3cb
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 v2 27/61] drm/qxl: Convert to atomic_create_state
2026-08-14 14:56 [PATCH v2 00/61] drm/plane: Convert all drivers to atomic_create_state and remove reset Maxime Ripard
@ 2026-08-14 14:57 ` Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 37/61] drm/virtio: " Maxime Ripard
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2026-08-14 14:57 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter
Cc: dri-devel, Maxime Ripard, airlied, kraxel, spice-devel,
virtualization
The plane only initializes a pristine state in its reset hook
using drm_atomic_helper_plane_reset(), which is equivalent to what
atomic_create_state expects. Convert to it.
The conversion was done using the following Coccinelle semantic patch:
@@
identifier funcs;
symbol drm_atomic_helper_plane_reset;
symbol drm_atomic_helper_plane_create_state;
@@
struct drm_plane_funcs funcs = {
...,
- .reset = drm_atomic_helper_plane_reset,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
...,
};
@match_struct_reset@
identifier funcs, reset_func;
@@
struct drm_plane_funcs funcs = {
...,
.reset = reset_func,
...,
};
@reset_uses_helpers depends on match_struct_reset@
identifier match_struct_reset.reset_func;
@@
void reset_func(...)
{
<+...
(
__drm_atomic_helper_plane_reset(...);
|
__drm_gem_reset_shadow_plane(...);
)
...+>
}
@match_struct_destroy@
identifier funcs, destroy_func;
@@
struct drm_plane_funcs funcs = {
...,
.atomic_destroy_state = destroy_func,
...,
};
@script:python renamed_func@
old_name << match_struct_reset.reset_func;
new_name;
@@
if old_name.endswith("_reset"):
coccinelle.new_name = old_name.replace("_reset", "_create_state")
else:
coccinelle.new_name = old_name
@update_struct depends on match_struct_reset && reset_uses_helpers@
identifier match_struct_reset.funcs, match_struct_reset.reset_func;
identifier renamed_func.new_name;
@@
struct drm_plane_funcs funcs = {
...,
- .reset = reset_func,
+ .atomic_create_state = new_name,
...,
};
@drop_destroy depends on update_struct && match_struct_destroy@
identifier match_struct_reset.reset_func;
identifier match_struct_destroy.destroy_func;
identifier container_func;
identifier P;
symbol drm_atomic_helper_plane_destroy_state;
symbol __drm_atomic_helper_plane_destroy_state;
@@
void reset_func(struct drm_plane *P)
{
...
(
- if (P->state) {
- <+...
(
- drm_atomic_helper_plane_destroy_state(P, P->state);
|
- __drm_atomic_helper_plane_destroy_state(P->state);
|
- P->funcs->atomic_destroy_state(P, P->state);
|
- destroy_func(P, P->state);
)
- ...+>
- }
|
- drm_WARN_ON_ONCE(P->dev, P->state);
|
- WARN_ON(P->state);
)
...
(
- kfree(P->state);
|
- kfree(container_func(P->state));
|
// kfree is optional
)
(
- P->state = NULL;
|
// plane->state clearing is optional
)
...
}
@drop_destroy_mtk depends on update_struct@
identifier P;
symbol __drm_atomic_helper_plane_destroy_state;
symbol to_mtk_plane_state;
@@
void mtk_plane_reset(struct drm_plane *P)
{
...
- if (P->state) {
- __drm_atomic_helper_plane_destroy_state(P->state);
- ...
- } else {
...
- }
...
}
@transform_nv50_wndw depends on update_struct@
identifier S;
@@
void nv50_wndw_reset(...)
{
...
- if (WARN_ON(!(S = kzalloc_obj(*S))))
+ S = kzalloc_obj(*S);
+ if (WARN_ON(!S))
return;
...
}
@transform_kzalloc depends on update_struct@
identifier match_struct_reset.reset_func;
identifier P, S;
statement ST;
statement list STL;
@@
void reset_func(struct drm_plane *P)
{
<...
S = kzalloc_obj(*S);
(
- if (S)
- {
- STL
- }
+ if (!S) return;
+
+ STL
|
- if (S) ST
+ if (!S) return;
+
+ ST
)
...>
}
@transform_body depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier S, P;
expression PS;
@@
- void reset_func(struct drm_plane *P)
+ struct drm_plane_state *new_name(struct drm_plane *P)
{
...
S = kzalloc_obj(*S);
...
(
if (!S) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
|
if (WARN_ON(!S)) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
|
if (S == NULL) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
)
...
(
- __drm_atomic_helper_plane_reset(P, PS);
+ __drm_atomic_helper_plane_state_init(PS, P);
|
- __drm_gem_reset_shadow_plane(P, PS);
+ __drm_gem_shadow_plane_state_init(P, PS);
)
...
}
@update_early_return depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
<+...
- return;
+ return ERR_PTR(-EINVAL);
...+>
}
@update_return_plane depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
...
__drm_atomic_helper_plane_state_init(PS, P);
...
+
+ return PS;
}
@update_return_shadow depends on update_struct@
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
...
__drm_gem_shadow_plane_state_init(P, PS);
...
+
+ return &PS->base;
}
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
Cc: airlied@redhat.com
Cc: kraxel@redhat.com
Cc: spice-devel@lists.freedesktop.org
Cc: virtualization@lists.linux.dev
---
drivers/gpu/drm/qxl/qxl_display.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 7f4178800afd..76337661c09e 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -927,11 +927,11 @@ static const struct drm_plane_helper_funcs qxl_cursor_helper_funcs = {
static const struct drm_plane_funcs qxl_cursor_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.destroy = drm_plane_helper_destroy,
- .reset = drm_atomic_helper_plane_reset,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
};
static const uint32_t qxl_primary_plane_formats[] = {
@@ -949,11 +949,11 @@ static const struct drm_plane_helper_funcs primary_helper_funcs = {
static const struct drm_plane_funcs qxl_primary_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.destroy = drm_plane_helper_destroy,
- .reset = drm_atomic_helper_plane_reset,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
};
static struct drm_plane *qxl_create_plane(struct qxl_device *qdev,
--
2.55.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 37/61] drm/virtio: Convert to atomic_create_state
2026-08-14 14:56 [PATCH v2 00/61] drm/plane: Convert all drivers to atomic_create_state and remove reset Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 27/61] drm/qxl: Convert to atomic_create_state Maxime Ripard
@ 2026-08-14 14:57 ` Maxime Ripard
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2026-08-14 14:57 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter
Cc: dri-devel, Maxime Ripard, airlied, dmitry.osipenko,
gurchetansingh, kraxel, olvaffe, virtualization
The plane only initializes a pristine state in its reset hook
using drm_atomic_helper_plane_reset(), which is equivalent to what
atomic_create_state expects. Convert to it.
The conversion was done using the following Coccinelle semantic patch:
@@
identifier funcs;
symbol drm_atomic_helper_plane_reset;
symbol drm_atomic_helper_plane_create_state;
@@
struct drm_plane_funcs funcs = {
...,
- .reset = drm_atomic_helper_plane_reset,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
...,
};
@match_struct_reset@
identifier funcs, reset_func;
@@
struct drm_plane_funcs funcs = {
...,
.reset = reset_func,
...,
};
@reset_uses_helpers depends on match_struct_reset@
identifier match_struct_reset.reset_func;
@@
void reset_func(...)
{
<+...
(
__drm_atomic_helper_plane_reset(...);
|
__drm_gem_reset_shadow_plane(...);
)
...+>
}
@match_struct_destroy@
identifier funcs, destroy_func;
@@
struct drm_plane_funcs funcs = {
...,
.atomic_destroy_state = destroy_func,
...,
};
@script:python renamed_func@
old_name << match_struct_reset.reset_func;
new_name;
@@
if old_name.endswith("_reset"):
coccinelle.new_name = old_name.replace("_reset", "_create_state")
else:
coccinelle.new_name = old_name
@update_struct depends on match_struct_reset && reset_uses_helpers@
identifier match_struct_reset.funcs, match_struct_reset.reset_func;
identifier renamed_func.new_name;
@@
struct drm_plane_funcs funcs = {
...,
- .reset = reset_func,
+ .atomic_create_state = new_name,
...,
};
@drop_destroy depends on update_struct && match_struct_destroy@
identifier match_struct_reset.reset_func;
identifier match_struct_destroy.destroy_func;
identifier container_func;
identifier P;
symbol drm_atomic_helper_plane_destroy_state;
symbol __drm_atomic_helper_plane_destroy_state;
@@
void reset_func(struct drm_plane *P)
{
...
(
- if (P->state) {
- <+...
(
- drm_atomic_helper_plane_destroy_state(P, P->state);
|
- __drm_atomic_helper_plane_destroy_state(P->state);
|
- P->funcs->atomic_destroy_state(P, P->state);
|
- destroy_func(P, P->state);
)
- ...+>
- }
|
- drm_WARN_ON_ONCE(P->dev, P->state);
|
- WARN_ON(P->state);
)
...
(
- kfree(P->state);
|
- kfree(container_func(P->state));
|
// kfree is optional
)
(
- P->state = NULL;
|
// plane->state clearing is optional
)
...
}
@drop_destroy_mtk depends on update_struct@
identifier P;
symbol __drm_atomic_helper_plane_destroy_state;
symbol to_mtk_plane_state;
@@
void mtk_plane_reset(struct drm_plane *P)
{
...
- if (P->state) {
- __drm_atomic_helper_plane_destroy_state(P->state);
- ...
- } else {
...
- }
...
}
@transform_nv50_wndw depends on update_struct@
identifier S;
@@
void nv50_wndw_reset(...)
{
...
- if (WARN_ON(!(S = kzalloc_obj(*S))))
+ S = kzalloc_obj(*S);
+ if (WARN_ON(!S))
return;
...
}
@transform_kzalloc depends on update_struct@
identifier match_struct_reset.reset_func;
identifier P, S;
statement ST;
statement list STL;
@@
void reset_func(struct drm_plane *P)
{
<...
S = kzalloc_obj(*S);
(
- if (S)
- {
- STL
- }
+ if (!S) return;
+
+ STL
|
- if (S) ST
+ if (!S) return;
+
+ ST
)
...>
}
@transform_body depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier S, P;
expression PS;
@@
- void reset_func(struct drm_plane *P)
+ struct drm_plane_state *new_name(struct drm_plane *P)
{
...
S = kzalloc_obj(*S);
...
(
if (!S) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
|
if (WARN_ON(!S)) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
|
if (S == NULL) {
...
- return;
+ return ERR_PTR(-ENOMEM);
}
)
...
(
- __drm_atomic_helper_plane_reset(P, PS);
+ __drm_atomic_helper_plane_state_init(PS, P);
|
- __drm_gem_reset_shadow_plane(P, PS);
+ __drm_gem_shadow_plane_state_init(P, PS);
)
...
}
@update_early_return depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
<+...
- return;
+ return ERR_PTR(-EINVAL);
...+>
}
@update_return_plane depends on update_struct@
identifier match_struct_reset.reset_func;
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
...
__drm_atomic_helper_plane_state_init(PS, P);
...
+
+ return PS;
}
@update_return_shadow depends on update_struct@
identifier renamed_func.new_name;
identifier P;
expression PS;
@@
struct drm_plane_state *new_name(struct drm_plane *P)
{
...
__drm_gem_shadow_plane_state_init(P, PS);
...
+
+ return &PS->base;
}
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
Cc: airlied@redhat.com
Cc: dmitry.osipenko@collabora.com
Cc: gurchetansingh@chromium.org
Cc: kraxel@redhat.com
Cc: olvaffe@gmail.com
Cc: virtualization@lists.linux.dev
---
drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 1d1b27ece62a..52971864db50 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -89,11 +89,11 @@ drm_plane_state *virtio_gpu_plane_duplicate_state(struct drm_plane *plane)
}
static const struct drm_plane_funcs virtio_gpu_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
- .reset = drm_atomic_helper_plane_reset,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
.atomic_duplicate_state = virtio_gpu_plane_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
};
static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,
--
2.55.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-08-14 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-14 14:56 [PATCH v2 00/61] drm/plane: Convert all drivers to atomic_create_state and remove reset Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 27/61] drm/qxl: Convert to atomic_create_state Maxime Ripard
2026-08-14 14:57 ` [PATCH v2 37/61] drm/virtio: " Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox