From patchwork Thu Jul 9 11:51:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 2596 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114]) by mxe881.netcup.net (Postfix) with ESMTPS id A20331C00D2 for ; Thu, 9 Jul 2026 13:55:05 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=kernel.org; spf=pass (sender IP is 172.105.105.114) smtp.mailfrom=linux-sunxi+bounces-24292-noreply=patchwork.local@lists.linux.dev smtp.helo=tor.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.105.105.114 as permitted sender) client-ip=172.105.105.114; envelope-from=linux-sunxi+bounces-24292-noreply=patchwork.local@lists.linux.dev; helo=tor.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by tor.lore.kernel.org (Postfix) with ESMTP id A32C8301CD9A for ; Thu, 9 Jul 2026 11:53:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98BCD36F414; Thu, 9 Jul 2026 11:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HLlxMCHj" X-Original-To: linux-sunxi@lists.linux.dev Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DC9A32BF41 for ; Thu, 9 Jul 2026 11:53:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783597993; cv=none; b=VOn0deOgE5XcHo0dYrHN0VoPWU51sWPWdZq45fMzANvsDELwzJOntDyRbg0/QYnqLv9ZJsboo4d4UqU4H/LO/Ooi5cM3xjGKrndweNdJ8Za/jtiLzGTvnBFHKv6LC7b6zbB5njG/c/W0G3zV5jvjJG0YU7G2wo8bXppER1I534Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783597993; c=relaxed/simple; bh=CvOlMzbUYqiNZ/OteRN5t1AzTP4s0QMUueqLDX9P4Ck=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KTFSncZvYmMxrdg8rqgKgWQ+JcAnUaBCKmOrq5KHiRRKfODblXmByLNroQyXCSpW39foA1agXoSmktVipZhdN9VnMCdH74VG8Ad8IZ3FivEMs0a/gqObn0PwqN+4gKk9ok7tchFSAElOkicBFvCRnyJgnU3PRhlmRaFK9uzBIo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HLlxMCHj; arc=none smtp.client-ip=100.103.45.18 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0B1A1F000E9; Thu, 9 Jul 2026 11:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783597992; bh=MhPdC54lf/9BxMjCppiPHv12iWBUHZF8qC6mMWznFqg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=HLlxMCHj1eK1ZwrGFqu2iCNlUZzyKQBENoAPkJmonxv2dgBfwNoUGYmAPqLQJQHm4 QvklJEwXpjUTuSOMmB58szJNsBPyOdrTnWN4Xu4zbjija0gddawgYwppB1bqpuyrbA 9h717fQ0xKK98AsXhu336lP11/rU643ep4DMmaxBmBNlTwq0ieehURR/PbsRs5KcDA 1f8cDhtj1+i0N3supGLSYIxPhh21z1dw2VXV6B/vMQbbNMSYhu08x/myzsGdR0d6Wp HmP1drYHxrGx7cBucMvbhwRM0lOdZdxdp8zAdDrAobb0E0onT+xrlDYgFSuWYJmgl+ MiiEfTsA90AYQ== From: Maxime Ripard Date: Thu, 09 Jul 2026 13:51:20 +0200 Subject: [PATCH 54/60] drm/sun4i: layer: Convert to atomic_create_state Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20260709-drm-no-more-plane-reset-v1-54-302d986fe5f0@kernel.org> References: <20260709-drm-no-more-plane-reset-v1-0-302d986fe5f0@kernel.org> In-Reply-To: <20260709-drm-no-more-plane-reset-v1-0-302d986fe5f0@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, Maxime Ripard , linux-sunxi@lists.linux.dev, samuel@sholland.org, wens@kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6990; i=mripard@kernel.org; h=from:subject:message-id; bh=CvOlMzbUYqiNZ/OteRN5t1AzTP4s0QMUueqLDX9P4Ck=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFn+3Yp6ay98LFs6YaFKlujMOPHfYiWa9sFfzklqvC7La +1Xd/rRMZWFQZiTQVZMkeWJTNjp5e2LqxzsV/6AmcPKBDKEgYtTACZyUZSxhnN9fVrcmnU756xf vmmBwfxH3RGle1OFFWP2h/9K32LuxcfUfEDB29Gfe911vdS9XGUXGRtmnpz2lLHsyUMm/X6+hSl rTNgZ9CzPmrRmfGCyS/4Sl2r4zPfLDtcJZsI+V/bN/agfYAIA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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. 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 --- Cc: linux-sunxi@lists.linux.dev Cc: samuel@sholland.org Cc: wens@kernel.org --- drivers/gpu/drm/sun4i/sun4i_layer.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c index d65587d96d9e..b165960ca8e5 100644 --- a/drivers/gpu/drm/sun4i/sun4i_layer.c +++ b/drivers/gpu/drm/sun4i/sun4i_layer.c @@ -14,11 +14,11 @@ #include "sun4i_backend.h" #include "sun4i_frontend.h" #include "sun4i_layer.h" #include "sunxi_engine.h" -static void sun4i_backend_layer_reset(struct drm_plane *plane) +static struct drm_plane_state *sun4i_backend_layer_create_state(struct drm_plane *plane) { struct sun4i_layer_state *state; if (plane->state) { state = state_to_sun4i_layer_state(plane->state); @@ -28,12 +28,16 @@ static void sun4i_backend_layer_reset(struct drm_plane *plane) kfree(state); plane->state = NULL; } state = kzalloc_obj(*state); - if (state) - __drm_atomic_helper_plane_reset(plane, &state->state); + if (!state) + return ERR_PTR(-ENOMEM); + + __drm_atomic_helper_plane_state_init(&state->state, plane); + + return &state->state; } static struct drm_plane_state * sun4i_backend_layer_duplicate_state(struct drm_plane *plane) { @@ -131,11 +135,11 @@ static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = { static const struct drm_plane_funcs sun4i_backend_layer_funcs = { .atomic_destroy_state = sun4i_backend_layer_destroy_state, .atomic_duplicate_state = sun4i_backend_layer_duplicate_state, .destroy = drm_plane_cleanup, .disable_plane = drm_atomic_helper_disable_plane, - .reset = sun4i_backend_layer_reset, + .atomic_create_state = sun4i_backend_layer_create_state, .update_plane = drm_atomic_helper_update_plane, .format_mod_supported = sun4i_layer_format_mod_supported, }; static const uint32_t sun4i_layer_formats[] = {