From nobody Tue Aug 25 08:46:14 2026 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 BE36341CB55 for ; Wed, 8 Jul 2026 16:09:05 +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=1783526946; cv=none; b=aygE/lwNgcerwslcpwuj1Y5KpdqHRrHfCgDDjA5PdhN5KA07NSSvTCQihsWTjzieKP4YSC0BkGSadjCVBHWxlgw/GXt3AwikfGURk9AGr/Q6AgxoU00Ip3xqD4wnNuMdu0GJGr81mblgNq9fy2fuzoiNv/o0Gl/hRK1DcWknpLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526946; c=relaxed/simple; bh=G+HVYHInY7UyUBvxRjBWcTIdkFXetkDN+/ALC9mefto=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=THsNP1Hvdr7HH7Pp1PGi1LykqQEAjBgH17z6WrJBcoSBrMpavZqKhxIN7g2Q4x+xUHCgeyYu6kqHsbgnRYDw0F0/10oJi0F6/51jbo4eAMRYoXRg206qHeBWYInILFqju2EIUx3duTJT63NFb4pVXER3E6QMx2yalcxH12aQeNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IHtSYZeb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IHtSYZeb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0B3E1F000E9; Wed, 8 Jul 2026 16:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783526945; bh=XBNlzrm2VUnzVBrb3FW1lerts2iFVkqleFLxdiQpBp4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=IHtSYZebmnZw11RU2iJ+M8pdzcQvKUU1dDyDEX/Qox+08aS6llFDeufE5JBj0PKQm wIldvovdnAr8U5TBzIPDCBhGhhC/U2OJzKFStsDTLp8VJtQ74VSy8nOAKUXpCvt3hw zWbhFgma0d63TQBikyzYl+BNo8QiWNTavYnhh18edBZy3cw9+mA+sgzBmdHolVU6Y7 2cjLS1RUSdeK+UIXsPNjxFpk6UPAZhno2YIPXnBd94omfEreWiTgSSjuQbWDJ2A5Mq WSDG0QOGJoLUChRLfMEQNuliKhnZeOYOz65Hg2oWZAClItEVz2nW120NKRP41Dcfju csuX8exd1xGTw== From: Maxime Ripard Date: Wed, 08 Jul 2026 18:08:43 +0200 Subject: [PATCH RFC 6/8] drm/atomic: Create function to insert connector state into a commit 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: <20260708-drm-reset-state-flag-v1-6-c37dc985485d@kernel.org> References: <20260708-drm-reset-state-flag-v1-0-c37dc985485d@kernel.org> In-Reply-To: <20260708-drm-reset-state-flag-v1-0-c37dc985485d@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Daniel Stone , Harry Wentland , =?utf-8?q?Jonas_=C3=85dahl?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Pekka Paalanen , Sebastian Wick , Simon Ser , Victoria Brekenfeld , Xaver Hugl , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4467; i=mripard@kernel.org; h=from:subject:message-id; bh=G+HVYHInY7UyUBvxRjBWcTIdkFXetkDN+/ALC9mefto=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFl+ZfzJYs0i7LdZRNZEnXlUMIFptYXgJ+d+6zwevsVWO 7fOnHu5YyoLgzAng6yYIssTmbDTy9sXVznYr/wBM4eVCWQIAxenAEyEYxtjfcDy5A/92RYiy+Uv bxNS+nPxCZforas/1ndPtnBzb4n0/eg1xTZu6y1xn9Z3P4qqa2/9Y2xYc3nNxr4ly/Y4ercw8qw Pn39XJpzhOf+3pRt9ipQMvqh5VO0xEHwUrurAdN07MrdxaRIA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_connector_state() allocates a new connector state by duplicating the current one and inserts it into the atomic commit as a single operation. However, a later change will need to insert a connector state into a commit without going through the full allocation and duplication path in drm_atomic_get_connector_state(). Extract the state insertion logic, including the dynamic array reallocation, into a new static drm_atomic_commit_set_connector_state() helper, and convert drm_atomic_get_connector_state() to use it. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 67 +++++++++++++++++++++++++++-------------= ---- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index d4dcab2d851c..79971d4b56a4 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1408,10 +1408,46 @@ drm_atomic_get_new_crtc_for_encoder(struct drm_atom= ic_commit *state, =20 return conn_state->crtc; } EXPORT_SYMBOL(drm_atomic_get_new_crtc_for_encoder); =20 +static int drm_atomic_commit_set_connector_state(struct drm_atomic_commit = *commit, + struct drm_connector *connector, + struct drm_connector_state *connector_state) +{ + struct drm_mode_config *config =3D &connector->dev->mode_config; + int index; + + drm_modeset_lock_assert_held(&config->connection_mutex); + + index =3D drm_connector_index(connector); + if (index >=3D commit->num_connector) { + struct __drm_connnectors_state *c; + int alloc =3D max(index + 1, config->num_connector); + + c =3D krealloc_array(commit->connectors, alloc, + sizeof(*commit->connectors), GFP_KERNEL); + if (!c) + return -ENOMEM; + + commit->connectors =3D c; + memset(&commit->connectors[commit->num_connector], 0, + sizeof(*commit->connectors) * (alloc - commit->num_connector)); + + commit->num_connector =3D alloc; + } + + drm_connector_get(connector); + commit->connectors[index].state_to_destroy =3D connector_state; + commit->connectors[index].old_state =3D connector->state; + commit->connectors[index].new_state =3D connector_state; + commit->connectors[index].ptr =3D connector; + connector_state->state =3D commit; + + return 0; +} + /** * drm_atomic_get_connector_state - get connector state * @state: global atomic state object * @connector: connector to get state object for * @@ -1426,53 +1462,34 @@ EXPORT_SYMBOL(drm_atomic_get_new_crtc_for_encoder); */ struct drm_connector_state * drm_atomic_get_connector_state(struct drm_atomic_commit *state, struct drm_connector *connector) { - int ret, index; + int ret; struct drm_mode_config *config =3D &connector->dev->mode_config; struct drm_connector_state *connector_state; =20 WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); =20 ret =3D drm_modeset_lock(&config->connection_mutex, state->acquire_ctx); if (ret) return ERR_PTR(ret); =20 - index =3D drm_connector_index(connector); - - if (index >=3D state->num_connector) { - struct __drm_connnectors_state *c; - int alloc =3D max(index + 1, config->num_connector); - - c =3D krealloc_array(state->connectors, alloc, - sizeof(*state->connectors), GFP_KERNEL); - if (!c) - return ERR_PTR(-ENOMEM); - - state->connectors =3D c; - memset(&state->connectors[state->num_connector], 0, - sizeof(*state->connectors) * (alloc - state->num_connector)); - - state->num_connector =3D alloc; - } - connector_state =3D drm_atomic_get_new_connector_state(state, connector); if (connector_state) return connector_state; =20 connector_state =3D connector->funcs->atomic_duplicate_state(connector); if (!connector_state) return ERR_PTR(-ENOMEM); =20 - drm_connector_get(connector); - state->connectors[index].state_to_destroy =3D connector_state; - state->connectors[index].old_state =3D connector->state; - state->connectors[index].new_state =3D connector_state; - state->connectors[index].ptr =3D connector; - connector_state->state =3D state; + ret =3D drm_atomic_commit_set_connector_state(state, connector, connector= _state); + if (ret) { + connector->funcs->atomic_destroy_state(connector, connector_state); + return ERR_PTR(ret); + } =20 drm_dbg_atomic(connector->dev, "Added [CONNECTOR:%d:%s] %p state to %p\n", connector->base.id, connector->name, connector_state, state); =20 --=20 2.54.0