From nobody Sat Apr 4 06:29:21 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8848C3D2FF5; Fri, 20 Mar 2026 16:27:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774024073; cv=none; b=PkOMj/MrUSbZFqBdMGwqNdW0pA4xYL5MBeLzmsbZ46vRgHBgdW6dxtPbRXFCM0axrCW2Z5mw2Mn6Ulb1amZClh2cOG0J4Cfc4xcQRsz/99AHqLrbl9nFHr+gXmc84xPDfdBjOJsytxbwReKLIFJjXIA5gS4R+a9eQOX1EOLJcQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774024073; c=relaxed/simple; bh=OYt8JWbC+U6q/3y2//UayFFXZtrcd5X4C504StwyqRQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GTX1rxFdhDtTc0RuALhnPoY07JjkvTwSOs1Mwrnfdl9g55kxzWG8wBB1T22mhwllHxCX3gmOnOBcGCYlemhOliaBPlZca3oIC9IJyEWylkUnStHPjEnOPgG6k62KlXqaDY8mw2v7bsxsC/YNLQvSYQ+KLhVmWGCIkOqMRpPjcRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DwIbUBtv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DwIbUBtv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 973E5C2BCB0; Fri, 20 Mar 2026 16:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774024073; bh=OYt8JWbC+U6q/3y2//UayFFXZtrcd5X4C504StwyqRQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DwIbUBtvumaLwZ1WZdcLDF7TptZ16+RxASwEbQzNQpnjPpfEltfnvFBUdcHDwhmRU Zmsqq3OG5Q2SFpa3movm/BWdLKo2EggXovikorC9vOk96UaWu92ojVxbTXeHOYdOzG wAHoHz24J9WyRCo6+uBt/LVXtTBxUM8zTD7m9r5j4q4SEMG7pY1nEiF9WMyrBvIMqN Xdk9nVHiXsIuwvrBGlzMWUVNRZ0cMPzUb/GUrk4vrKNe/l2/UMj+9NI10iSLWyD2Wg MgXDhMm2abVNz/uFjMyyKaklV7Kol+SV6Uarkf4NvQCzj/55IUxTkUlrIAFzM4worI /p7hbIdVexT+A== From: Maxime Ripard Date: Fri, 20 Mar 2026 17:27:16 +0100 Subject: [PATCH v2 09/20] drm/atomic-state-helper: Rename __drm_atomic_helper_crtc_state_reset() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260320-drm-mode-config-init-v2-9-c63f1134e76c@kernel.org> References: <20260320-drm-mode-config-init-v2-0-c63f1134e76c@kernel.org> In-Reply-To: <20260320-drm-mode-config-init-v2-0-c63f1134e76c@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Jonathan Corbet , Shuah Khan , Dmitry Baryshkov , Jyri Sarha , Tomi Valkeinen , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Simon Ser , Harry Wentland , Melissa Wen , Sebastian Wick , Alex Hung , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Chen-Yu Tsai , Samuel Holland , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Maxime Ripard , Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4492; i=mripard@kernel.org; h=from:subject:message-id; bh=OYt8JWbC+U6q/3y2//UayFFXZtrcd5X4C504StwyqRQ=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDJl7S9MDOHvnzzj21Ncr7+PaI8x37rqcnKR0roKvNzVr+ pUg4ekXO6ayMAhzMsiKKbI8kQk7vbx9cZWD/cofMHNYmUCGMHBxCsBE7mkyVrNNmca1aWdeg/3B fx8rz0zmYdmfz/NsptErdZ4Lju8ufBMx45T5xLM52mKeo+3DkpJtzIwNrdYf8pi8z7nfWaS1qu3 J1IsP1s/Y1vVnYbfiybV/ru//59KSWGyaaBH1aUlr8IFuvqAFAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D __drm_atomic_helper_crtc_state_reset() is used to initialize a newly allocated drm_crtc_state, and is being typically called by the drm_crtc_funcs.reset implementation. Since we want to consolidate DRM objects state allocation around the atomic_create_state callback that will only allocate and initialize a new drm_crtc_state instance, we will need to call __drm_atomic_helper_crtc_state_reset() from both the reset and atomic_create hooks. To avoid any confusion, we can thus rename __drm_atomic_helper_crtc_state_reset() to __drm_atomic_helper_crtc_state_init(). Suggested-by: Laurent Pinchart Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic_state_helper.c | 10 +++++----- drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- include/drm/drm_atomic_state_helper.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/dr= m_atomic_state_helper.c index f4ce9d3573cbecf216904db54335e0cf84a01c39..b87cc3cd5b0021699ac57a33739= d172a5706e2e1 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -61,25 +61,25 @@ * For other drivers the building blocks are split out, see the documentat= ion * for these functions. */ =20 /** - * __drm_atomic_helper_crtc_state_reset - reset the CRTC state + * __drm_atomic_helper_crtc_state_init - Initializes the CRTC state * @crtc_state: atomic CRTC state, must not be NULL * @crtc: CRTC object, must not be NULL * * Initializes the newly allocated @crtc_state with default * values. This is useful for drivers that subclass the CRTC state. */ void -__drm_atomic_helper_crtc_state_reset(struct drm_crtc_state *crtc_state, - struct drm_crtc *crtc) +__drm_atomic_helper_crtc_state_init(struct drm_crtc_state *crtc_state, + struct drm_crtc *crtc) { crtc_state->crtc =3D crtc; crtc_state->background_color =3D DRM_ARGB64_PREP(0xffff, 0, 0, 0); } -EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_reset); +EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_init); =20 /** * __drm_atomic_helper_crtc_reset - reset state on CRTC * @crtc: drm CRTC * @crtc_state: CRTC state to assign @@ -94,11 +94,11 @@ EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_reset); void __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, struct drm_crtc_state *crtc_state) { if (crtc_state) - __drm_atomic_helper_crtc_state_reset(crtc_state, crtc); + __drm_atomic_helper_crtc_state_init(crtc_state, crtc); =20 if (drm_dev_has_vblank(crtc->dev)) drm_crtc_vblank_reset(crtc); =20 crtc->state =3D crtc_state; diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i9= 15/display/intel_crtc.c index 53378d2dcbec867e7973cb3b874802f2ada01d41..b57a59a5f7786f1029d576b0f3d= 564e77b7060e4 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -179,11 +179,11 @@ struct intel_crtc_state *intel_crtc_state_alloc(struc= t intel_crtc *crtc) void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, struct intel_crtc *crtc) { memset(crtc_state, 0, sizeof(*crtc_state)); =20 - __drm_atomic_helper_crtc_state_reset(&crtc_state->uapi, &crtc->base); + __drm_atomic_helper_crtc_state_init(&crtc_state->uapi, &crtc->base); =20 crtc_state->cpu_transcoder =3D INVALID_TRANSCODER; crtc_state->master_transcoder =3D INVALID_TRANSCODER; crtc_state->hsw_workaround_pipe =3D INVALID_PIPE; crtc_state->scaler_state.scaler_id =3D -1; diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic= _state_helper.h index 6a3a2feb3dff1f2fbdf2a6e63d8d7317c7d6ead6..161cd1f6b8266e882eb1fd128b4= 03cba350be3d2 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -38,11 +38,11 @@ struct drm_connector_state; struct drm_private_obj; struct drm_private_state; struct drm_modeset_acquire_ctx; struct drm_device; =20 -void __drm_atomic_helper_crtc_state_reset(struct drm_crtc_state *state, +void __drm_atomic_helper_crtc_state_init(struct drm_crtc_state *state, struct drm_crtc *crtc); void __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, struct drm_crtc_state *state); void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc); void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, --=20 2.53.0