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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D85A5CC6B38 for ; Fri, 16 Oct 2026 07:32:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 30A04112646; Fri, 16 Oct 2026 07:32:18 +0000 (UTC) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F43710E202 for ; Fri, 16 Oct 2026 07:32:11 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 66A3A444F9; Fri, 16 Oct 2026 07:32:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C73321F000C5; Fri, 16 Oct 2026 07:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792135931; bh=G0WrUCjAIsPm3SYP1oy0wCtDhqnDyFdKOZoLiesKNL4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=UR9fry87HAZAt0axM43Pwd+LqgKXDl/ojVz5J2dUMJO0OsLGB72dl78lmo/MMaij4 88fZNlTS9F73jYEdldVGK6ZruM96hfwAUdHY4ABxVj2aG3bIiKa+BS3WHv4L1/W/0A 5T7dglTynH13/SlJ5UW6Pdoj/OXc8h9gKPjsRf8ZsAgU4B0EVVBfm0ay+vlGwTBAbh 6geeIEomwamyOD9cwIjwVjqJ88wvlZPlo+Jyc+lO8zV2YqGktF+pdcBvpDbKAGaUX2 ei+I+4QnqKJs+J8kPlkAdXUcUla01iPA18F0hNAQ77y9Aq2g8B4wWKcrNJKOCxAVSD ipoJdSdQOi63A== From: Maxime Ripard Date: Fri, 16 Oct 2026 09:31:36 +0200 Subject: [PATCH v5 04/14] drm/atomic: Create function to insert CRTC state into a commit MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261016-drm-reset-state-flag-v5-4-dad2d64b693b@kernel.org> References: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> In-Reply-To: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@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=2711; i=mripard@kernel.org; h=from:subject:message-id; bh=YCIetT5kjTkg2BMQMM7gF/Va5QfOxZ1GTYzmpwY1jug=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFkXLz1i2XPfQrAr291+3eQwvhs5Qbe3cYYL/Jqd3Fn6h fHVUrXNHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAiC0UZ6yOZe3IPLWVdGS33 /sKyY+ylt+5apN6cpr+upOuXQa7+/T7LQlGPAG/djz5nHRctmKy+i7HO8m/+T3tD9Q3RqnKx57P PRro+L4o+tGNZTKB3/CSRfwt+Vnv/+bDTgCHc6zXr1nNCJ38AAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm_atomic_get_crtc_state() allocates a new CRTC 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 CRTC state into a commit without going through the full allocation and duplication path in drm_atomic_get_crtc_state(). Extract the state insertion logic into a new static drm_atomic_commit_set_crtc_state() helper, and convert drm_atomic_get_crtc_state() to use it. Reviewed-by: Thomas Zimmermann Reviewed-by: Daniel Stone 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 80436adcfb7f..178eca95d0e3 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -431,10 +431,25 @@ void __drm_atomic_commit_free(struct kref *ref) drm_dev_put(dev); } EXPORT_SYMBOL(__drm_atomic_commit_free); +static void drm_atomic_commit_set_crtc_state(struct drm_atomic_commit *commit, + struct drm_crtc *crtc, + struct drm_crtc_state *crtc_state) +{ + int index = drm_crtc_index(crtc); + + drm_modeset_lock_assert_held(&crtc->mutex); + + commit->crtcs[index].state_to_destroy = crtc_state; + commit->crtcs[index].old_state = crtc->state; + commit->crtcs[index].new_state = crtc_state; + commit->crtcs[index].ptr = crtc; + crtc_state->state = commit; +} + /** * drm_atomic_get_crtc_state - get CRTC state * @state: global atomic state object * @crtc: CRTC to get state object for * @@ -453,11 +468,11 @@ EXPORT_SYMBOL(__drm_atomic_commit_free); */ struct drm_crtc_state * drm_atomic_get_crtc_state(struct drm_atomic_commit *state, struct drm_crtc *crtc) { - int ret, index = drm_crtc_index(crtc); + int ret; struct drm_crtc_state *crtc_state; WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); @@ -471,15 +486,11 @@ drm_atomic_get_crtc_state(struct drm_atomic_commit *state, crtc_state = crtc->funcs->atomic_duplicate_state(crtc); if (!crtc_state) return ERR_PTR(-ENOMEM); - state->crtcs[index].state_to_destroy = crtc_state; - state->crtcs[index].old_state = crtc->state; - state->crtcs[index].new_state = crtc_state; - state->crtcs[index].ptr = crtc; - crtc_state->state = state; + drm_atomic_commit_set_crtc_state(state, crtc, crtc_state); drm_dbg_atomic(state->dev, "Added [CRTC:%d:%s] %p state to %p\n", crtc->base.id, crtc->name, crtc_state, state); return crtc_state; -- 2.55.0