From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6AEA0CD3427 for ; Mon, 4 May 2026 17:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=z//qgLM0aBDxnN1GMW2KwNg8eifIInXOizK0clqqKHA=; b=1ll6XJI7DP5KA//capR2+ogcwv 7RCfFo5hvqMCE5KzAHotH2Xmd63P2B77Z1K01y97ywyGJzeE5tB4mbyCwcgM1gtivKYEoA285QVpk UPWIxno9aZUT+aBZrmro16pkgp/eZJOJSeMK8mEA07AXnRnZiJP0RWhoUT44xkrfI7rm/JRcCEcO+ WTqJepODO6Aeab0HxJ0Q0BVmGyLjvSgiQjeNxW97sgQMpIyPFYxI+HnYVnvjHAg2IIaRUQMP8/odl pHHUiYFdyC97+pHj854wT/EEjGnnToq4MMUUOM9/Icql6xbpw7lck6PCo3J2zkXxXl0udrTaIUx13 MDkYP4VQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wJx9a-0000000DrW8-0CK6; Mon, 04 May 2026 17:32:22 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wJx9X-0000000DrVd-32eq for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2026 17:32:21 +0000 Received: from killaraus.ideasonboard.com (2001-14ba-703d-e500--2a1.rev.dnainternet.fi [IPv6:2001:14ba:703d:e500::2a1]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BAF3E175; Mon, 4 May 2026 19:32:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1777915936; bh=7ljuuXQlUYJhdWaPoHxPjcLlFuHa7ulDVfCd/SUITVY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aP/WZDgfTDBDrE0IqDx6WrI818l9IYpUNNwWhi+xBU4xsyyPSDjS2hPBdl4Zxwf4m SntUmpS75lSvNtsAQhUpLyGp7KTG77HmE41lhhQfwzJ3A8kFq+8Rt536Zo6tuxC5sm 6f7ERSBbXKz7j7h48xBMORS9ON/CtCMvVtLSl37s= Date: Mon, 4 May 2026 20:32:16 +0300 From: Laurent Pinchart To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Jonathan Corbet , Shuah Khan , Dmitry Baryshkov , Jyri Sarha , Tomi Valkeinen , Andrzej Hajda , Neil Armstrong , Robert Foss , 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?B?TWHDrXJh?= Canal , Raspberry Pi Kernel Maintenance , 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 Subject: Re: [PATCH v3 14/20] drm/hdmi: Rename __drm_atomic_helper_connector_hdmi_reset() Message-ID: <20260504173216.GQ1344263@killaraus.ideasonboard.com> References: <20260424-drm-mode-config-init-v3-0-8b68d9db0d8b@kernel.org> <20260424-drm-mode-config-init-v3-14-8b68d9db0d8b@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260424-drm-mode-config-init-v3-14-8b68d9db0d8b@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260504_103219_970136_F7D88014 X-CRM114-Status: GOOD ( 24.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Apr 24, 2026 at 12:18:54PM +0200, Maxime Ripard wrote: > __drm_atomic_helper_connector_hdmi_reset() is typically used to > initialize a newly allocated drm_connector_state when the connector is > using the HDMI helpers, and is being called by the > drm_connector_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_connector_state instance, we will need to call > __drm_atomic_helper_connector_hdmi_reset() from both the reset and > atomic_create hooks. > > To avoid any confusion, we can thus rename > __drm_atomic_helper_connector_hdmi_reset() to > __drm_atomic_helper_connector_hdmi_state_init(). > > Suggested-by: Laurent Pinchart > Reviewed-by: Dmitry Baryshkov > Reviewed-by: Thomas Zimmermann > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/display/drm_bridge_connector.c | 4 ++-- > drivers/gpu/drm/display/drm_hdmi_state_helper.c | 13 +++++++------ > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- > drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 2 +- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > include/drm/display/drm_hdmi_state_helper.h | 4 ++-- > 6 files changed, 14 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c > index 39cc18f78eda..d72f29b73be3 100644 > --- a/drivers/gpu/drm/display/drm_bridge_connector.c > +++ b/drivers/gpu/drm/display/drm_bridge_connector.c > @@ -270,12 +270,12 @@ static void drm_bridge_connector_reset(struct drm_connector *connector) > struct drm_bridge_connector *bridge_connector = > to_drm_bridge_connector(connector); > > drm_atomic_helper_connector_reset(connector); > if (bridge_connector->bridge_hdmi) > - __drm_atomic_helper_connector_hdmi_reset(connector, > - connector->state); > + __drm_atomic_helper_connector_hdmi_state_init(connector, > + connector->state); > } > > static const struct drm_connector_funcs drm_bridge_connector_funcs = { > .reset = drm_bridge_connector_reset, > .detect = drm_bridge_connector_detect, > diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c > index 9f3b696aceeb..8bf7ad3c99fb 100644 > --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c > +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c > @@ -304,29 +304,30 @@ > * --kunitconfig=drivers/gpu/drm/tests \ > * drm_atomic_helper_connector_hdmi_* > */ > > /** > - * __drm_atomic_helper_connector_hdmi_reset() - Initializes all HDMI @drm_connector_state resources > + * __drm_atomic_helper_connector_hdmi_state_init() - Initializes all HDMI @drm_connector_state resources While at it, s/Initializers/Initialize/ > * @connector: DRM connector > * @new_conn_state: connector state to reset s/to reset/to initialize/ Reviewed-by: Laurent Pinchart > * > * Initializes all HDMI resources from a @drm_connector_state without > * actually allocating it. This is useful for HDMI drivers, in > - * combination with __drm_atomic_helper_connector_reset() or > - * drm_atomic_helper_connector_reset(). > + * combination with __drm_atomic_helper_connector_state_init(), > + * drm_atomic_helper_connector_reset(), or > + * drm_atomic_helper_connector_create_state() . > */ > -void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector, > - struct drm_connector_state *new_conn_state) > +void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector *connector, > + struct drm_connector_state *new_conn_state) > { > unsigned int max_bpc = connector->max_bpc; > > new_conn_state->max_bpc = max_bpc; > new_conn_state->max_requested_bpc = max_bpc; > new_conn_state->hdmi.broadcast_rgb = DRM_HDMI_BROADCAST_RGB_AUTO; > } > -EXPORT_SYMBOL(__drm_atomic_helper_connector_hdmi_reset); > +EXPORT_SYMBOL(__drm_atomic_helper_connector_hdmi_state_init); > > static enum hdmi_colorspace > output_color_format_to_hdmi_colorspace(const struct drm_connector *connector, > enum drm_output_color_format fmt) > { > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > index dd2a78defdb4..29dfff4f0055 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > @@ -283,11 +283,11 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force) > } > > static void sun4i_hdmi_connector_reset(struct drm_connector *connector) > { > drm_atomic_helper_connector_reset(connector); > - __drm_atomic_helper_connector_hdmi_reset(connector, connector->state); > + __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); > } > > static const struct drm_connector_funcs sun4i_hdmi_connector_funcs = { > .detect = sun4i_hdmi_connector_detect, > .fill_modes = drm_helper_probe_single_connector_modes, > diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c > index a4357efaa983..5d671b281f28 100644 > --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c > +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c > @@ -166,11 +166,11 @@ static const struct drm_connector_helper_funcs dummy_connector_helper_funcs = { > }; > > static void dummy_hdmi_connector_reset(struct drm_connector *connector) > { > drm_atomic_helper_connector_reset(connector); > - __drm_atomic_helper_connector_hdmi_reset(connector, connector->state); > + __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); > } > > static const struct drm_connector_funcs dummy_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index a99f53dadb28..14fcee05e133 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -506,11 +506,11 @@ static int vc4_hdmi_connector_atomic_check(struct drm_connector *connector, > } > > static void vc4_hdmi_connector_reset(struct drm_connector *connector) > { > drm_atomic_helper_connector_reset(connector); > - __drm_atomic_helper_connector_hdmi_reset(connector, connector->state); > + __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); > drm_atomic_helper_connector_tv_margins_reset(connector); > } > > static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { > .force = drm_atomic_helper_connector_hdmi_force, > diff --git a/include/drm/display/drm_hdmi_state_helper.h b/include/drm/display/drm_hdmi_state_helper.h > index 2349c0d0f00f..f7600aabdd5f 100644 > --- a/include/drm/display/drm_hdmi_state_helper.h > +++ b/include/drm/display/drm_hdmi_state_helper.h > @@ -9,12 +9,12 @@ struct drm_connector_state; > struct drm_display_mode; > struct hdmi_audio_infoframe; > > enum drm_connector_status; > > -void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector, > - struct drm_connector_state *new_conn_state); > +void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector *connector, > + struct drm_connector_state *new_conn_state); > > int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, > struct drm_atomic_state *state); > > int drm_atomic_helper_connector_hdmi_update_audio_infoframe(struct drm_connector *connector, -- Regards, Laurent Pinchart