From mboxrd@z Thu Jan 1 00:00:00 1970 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 0C7414FC320 for ; Fri, 18 Sep 2026 14:18:20 +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=1789741102; cv=none; b=FrJ9l21Ca47eTSrBXFTRwV+I8zafUq51CzM+4YMkQfn+ZxBIWat6YE1fSvPXWUZcd+4YEksu3Gpec/NarqcYbQC3xkQb69YbC7x6USVWHAY8btcanONYBDtzKb+OwkeZvLWLLMQ4sLTkamk6JRGnjGBNHjgZfiopwB+xs2/vEaY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789741102; c=relaxed/simple; bh=umHqq+vvO35oRQTGbn6Ts9IWZXv3q3bKljlSLnPlabs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jHTG7E59jgfIPAZiqa5XuWfJbnu2/p2yH80jtAzTlYkenBGYueXa4TBHTxru/VlH95yrJSTCE9NnWhflsVZ2OncxEAlq2ihMZdys0qG4J0T4F9Odgn2AXYwRUezBQX2/zWOcUku1gFTRLOUmrWz8kLHi8tOXtTP1m8hLzGTjU7Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=khBtPNeF; 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="khBtPNeF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 341A91F000FF; Fri, 18 Sep 2026 14:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789741100; bh=Z0JGJXj4Um4YfgnYDwlmuWCSYIBxIj5z/95Lrd2v0QQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=khBtPNeFOR+fqZXgw17/gHpztu/6pI9N2axu1SE737tRXZ59wEiSuh9f8naGHM6qj I91x51Nd3rJHJ8b0h0zFKfY+7ZEU8GgIgU5x2oc1Y70fHfW6GNHdc7oxMMoQ48qxh9 XPF2AkQwnTW1CjEL5fBZL1HjaPXHOHqminZ/3p0GTKT8sGXlhYNBsRhN7oMvyMBec6 RzFcL/rM+6R8at1/rn0qsCyfAAcmf3WLES/FzazvUNRZ/i5FpDiDzOeG2rvef69bqi uVjTxu9wmZhcxBWqUbmbsfZIuPQZWgXevvB8WSdVCxKK6zJv5zr+0YrX3JIoMQeS2K V5fg3YGOfE3eA== From: Maxime Ripard Date: Fri, 18 Sep 2026 16:17:54 +0200 Subject: [PATCH v4 05/13] drm/atomic: Create function to insert plane 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: 7bit Message-Id: <20260918-drm-reset-state-flag-v4-5-5ad106370f05@kernel.org> References: <20260918-drm-reset-state-flag-v4-0-5ad106370f05@kernel.org> In-Reply-To: <20260918-drm-reset-state-flag-v4-0-5ad106370f05@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Daniel Stone , Harry Wentland , Jocelyn Falempe , =?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=2731; i=mripard@kernel.org; h=from:subject:message-id; bh=umHqq+vvO35oRQTGbn6Ts9IWZXv3q3bKljlSLnPlabs=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFlrPQQLt37JqNPsmLhUM3/qroMBjnIVXPxms39GXA0+H HpPIUyoYyoLgzAng6yYIssTmbDTy9sXVznYr/wBM4eVCWQIAxenAEzEajJjfb2Z0jMvt82a2uF6 KzLe7nrmV6IaVC9sbsoZa87ks8leaNadLTqu5w1MS16qXP/4f2skY8MvecfwWwrfVZqVfnBVnLA 8wdvE6HDQZfIapfU/xU8e+RPyovDb9xkMz8scOUondj69ogcA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_plane_state() allocates a new plane 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 plane state into a commit without going through the full allocation and duplication path in drm_atomic_get_plane_state(). Extract the state insertion logic into a new static drm_atomic_commit_set_plane_state() helper, and convert drm_atomic_get_plane_state() to use it. Reviewed-by: Thomas Zimmermann Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 178eca95d0e3..b26458ee98d8 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -628,10 +628,25 @@ static int drm_atomic_connector_check(struct drm_connector *connector, } return 0; } +static void drm_atomic_commit_set_plane_state(struct drm_atomic_commit *commit, + struct drm_plane *plane, + struct drm_plane_state *plane_state) +{ + int index = drm_plane_index(plane); + + drm_modeset_lock_assert_held(&plane->mutex); + + commit->planes[index].state_to_destroy = plane_state; + commit->planes[index].old_state = plane->state; + commit->planes[index].new_state = plane_state; + commit->planes[index].ptr = plane; + plane_state->state = commit; +} + /** * drm_atomic_get_plane_state - get plane state * @state: global atomic state object * @plane: plane to get state object for * @@ -646,11 +661,11 @@ static int drm_atomic_connector_check(struct drm_connector *connector, */ struct drm_plane_state * drm_atomic_get_plane_state(struct drm_atomic_commit *state, struct drm_plane *plane) { - int ret, index = drm_plane_index(plane); + int ret; struct drm_plane_state *plane_state; WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); @@ -669,15 +684,11 @@ drm_atomic_get_plane_state(struct drm_atomic_commit *state, plane_state = plane->funcs->atomic_duplicate_state(plane); if (!plane_state) return ERR_PTR(-ENOMEM); - state->planes[index].state_to_destroy = plane_state; - state->planes[index].ptr = plane; - state->planes[index].old_state = plane->state; - state->planes[index].new_state = plane_state; - plane_state->state = state; + drm_atomic_commit_set_plane_state(state, plane, plane_state); drm_dbg_atomic(plane->dev, "Added [PLANE:%d:%s] %p state to %p\n", plane->base.id, plane->name, plane_state, state); if (plane_state->crtc) { -- 2.55.0