From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.171.202.116 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795020655; b=V3+97XSK4pF+axs2jjmS9mbJqM4fGd6aPXtIfp3jXfYxKb29FJupV3XTpZ25Zz9SM21g fXZ7O31gEtSFCwhb2zjiR2+3kBKSHm2STFMMUVrMWG6QtzdG2ehBexpn9XUWGCA8fmSkR z/KDAoXAqD5KvuoYF0ketH9haPy/WW15GEFvhSUaWF/W2In3aHEbR8b+sAK98pU7P3Zrr h3P9M0Ny0TeUhoXbqfrmhTQ2ujCVgI9RYICnqtbcVoCki8CKhGzX7W79kci1Z7AOfsnDV KzlScrFLXCtP4WNfMORFW0+yj78xPKq0E3pAExOwoOcfBUJFkxmNFm7Fqm87wVJfOdQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795020655; h=DMARC-Filter:Received:Received:Received:DKIM-Signature:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Last-TLS-Session-Version; bh=P2dly+ossNj1qDZwGJA919lBU17RRLe3L+ZW85zZWic=; b=QTKwuTJCazeOUc2/1rDuf0mV4ZHuXlLv2N9qIl2MFfZ4i4YzIWwCv5exafN5WwFqeDxN 0nQLvIEiuJU9bOBh6zvc2xxDwLr97CeUfwJ5YLxwBT46nvUX8Av95nxqIbenmEhG05vLI 3oVRNo085NU01qEUV6TwxrzGdQ9fquq8rKpENokMisPzehv4ttX6N8dkMnPJDZhEQJcZj We8iV6KfORKyzrx0wxRM2pbjQSY0xrN73EbQvWDYPBoaq8jICJId528Lp5cZdca0367RY q70vob6ZMHsShVyevrp04gYna5wDB0+4JY3lff7Bo9pIXhIYur3ZohEG0AesEA8ohHA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=dkim header.b=HAxlwcXm; arc=none smtp.remote-ip=185.171.202.116 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9D7B606A33D for ; Wed, 18 Nov 2026 16:50:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E9D7B606A33D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=dkim header.b=HAxlwcXm Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 60155C4F77B; Wed, 18 Nov 2026 16:50:57 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 7B83B5FE9B; Wed, 18 Nov 2026 16:50:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 028A311BC28AC; Wed, 18 Nov 2026 17:50:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795020649; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=P2dly+ossNj1qDZwGJA919lBU17RRLe3L+ZW85zZWic=; b=HAxlwcXmCDxdApzA9951AoGuBWc3vIXZwtTR0Cpq3imVWHntGdI2kstKq2VQ15qSC66nOz s/aK1h41Hws+y+mWVP+w4Otn5yDROpxGKBJexVF7zX3WDdshG0ruPw4nKT8EM01jOp3/ua uChOtd3zKkwcE2O1Ta3GEZGb5Ypr4BZzTvA27rp7YL8dctoogL772JJNQPiFtMGD+zsXBb EosTLBqaJVMDRrXG297lIeJ32BmCZ933+HmWlLjr+xhBcjapXNYlfOgAXZcuyBEoFAf4n5 HRg9NlJ3+JOLe4hf7BVW0ru+KmGdKR8e7E72CMSJeW6q3PFtBpuN12dvJz25qg== From: Luca Ceresoli Date: Wed, 18 Nov 2026 17:49:50 +0100 Subject: [PATCH RFC v3 07/31] drm/display: bridge-connector: split allocation code from initialization code X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261118-drm-bridge-hotplug-v3-7-44bb3b4a828f@bootlin.com> References: <20261118-drm-bridge-hotplug-v3-0-44bb3b4a828f@bootlin.com> In-Reply-To: <20261118-drm-bridge-hotplug-v3-0-44bb3b4a828f@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Inki Dae , Jagan Teki , Marek Szyprowski , Jessica Zhang , Douglas Anderson , Marek Vasut , Stefan Agner , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: Hui Pu , Ian Ray , Luca Ceresoli , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.16.0 X-Last-TLS-Session-Version: TLSv1.3 Currently drm_bridge_connector_init() does two things: * allocate and initialize the drm_bridge_connector (which embeds a drm_connector) using drmm * initialize and register the embedded drm_connector For bridge hotplug drmm allocations are not suitable because a connector may have to be added and removed multiple times in the lifetime of a card. In preparation to support that, split out from drm_bridge_connector_init() the code to allocate the drm_bridge_connector, so new (de)allocation code can reuse all the initialization code. Signed-off-by: Luca Ceresoli --- Changes in v3: - Slightly tweak commit title --- drivers/gpu/drm/display/drm_bridge_connector.c | 62 ++++++++++++++++---------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 2202e6044444..19cacae617dc 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -837,27 +837,11 @@ static void drm_bridge_connector_put_bridges(struct drm_device *dev, void *data) drm_bridge_put(bridge_connector->bridge_hdmi_cec); } -/** - * drm_bridge_connector_init - Initialise a connector for a chain of bridges - * @drm: the DRM device - * @encoder: the encoder where the bridge chain starts - * - * Create a new &drm_bridge_connector for the @drm device. The connector is - * allocated, initialised, registered with the @drm device and attached to - * @encoder. - * - * The connector is associated with a chain of bridges that starts at - * the @encoder. All bridges in the chain shall report bridge operation flags - * (&drm_bridge->ops) and bridge output type (&drm_bridge->type), and none of - * them may create a DRM connector directly. - * - * Returns a pointer to the new connector on success, or a negative error - * pointer otherwise. - */ -struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, - struct drm_encoder *encoder) +static struct drm_connector * +drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector, + struct drm_device *drm, + struct drm_encoder *encoder) { - struct drm_bridge_connector *bridge_connector; struct drm_connector *connector; struct i2c_adapter *ddc = NULL; struct drm_bridge *panel_bridge __free(drm_bridge_put) = NULL; @@ -865,10 +849,6 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, int connector_type; int ret; - bridge_connector = drmm_kzalloc(drm, sizeof(*bridge_connector), GFP_KERNEL); - if (!bridge_connector) - return ERR_PTR(-ENOMEM); - ret = drmm_add_action(drm, drm_bridge_connector_put_bridges, bridge_connector); if (ret) return ERR_PTR(ret); @@ -1154,4 +1134,38 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, return connector; } + +/** + * drm_bridge_connector_init - Initialise a connector for a chain of bridges + * @drm: the DRM device + * @encoder: the encoder where the bridge chain starts + * + * Create a new &drm_bridge_connector for the @drm device. The connector is + * allocated, initialised, registered with the @drm device and attached to + * @encoder. + * + * The connector is associated with a chain of bridges that starts at + * the @encoder. All bridges in the chain shall report bridge operation flags + * (&drm_bridge->ops) and bridge output type (&drm_bridge->type), and none of + * them may create a DRM connector directly. + * + * Returns a pointer to the new connector on success, or a negative error + * pointer otherwise. + */ +struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, + struct drm_encoder *encoder) +{ + struct drm_bridge_connector *bridge_connector; + struct drm_connector *connector; + + bridge_connector = drmm_kzalloc(drm, sizeof(*bridge_connector), GFP_KERNEL); + if (!bridge_connector) + return ERR_PTR(-ENOMEM); + + connector = drm_bridge_connector_initialize(bridge_connector, drm, encoder); + if (IS_ERR(connector)) + return connector; + + return connector; +} EXPORT_SYMBOL_GPL(drm_bridge_connector_init); -- 2.56.1