From nobody Tue Dec 16 11:45:36 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1163C4332F for ; Mon, 6 Nov 2023 07:38:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231229AbjKFHiI (ORCPT ); Mon, 6 Nov 2023 02:38:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231190AbjKFHiE (ORCPT ); Mon, 6 Nov 2023 02:38:04 -0500 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DEE3112 for ; Sun, 5 Nov 2023 23:37:56 -0800 (PST) X-UUID: 272ee5e3370f4af59d4d6569884386e7-20231106 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.32,REQID:650d6552-cc29-407a-8975-6d33b1b6e4b1,IP:5,U RL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:15 X-CID-INFO: VERSION:1.1.32,REQID:650d6552-cc29-407a-8975-6d33b1b6e4b1,IP:5,URL :0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:15 X-CID-META: VersionHash:5f78ec9,CLOUDID:6a6332fc-4a48-46e2-b946-12f04f20af8c,B ulkID:231106153745CC6A3BO8,BulkQuantity:0,Recheck:0,SF:66|24|17|19|44|102, TC:nil,Content:0,EDM:5,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-UUID: 272ee5e3370f4af59d4d6569884386e7-20231106 X-User: oushixiong@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 364484791; Mon, 06 Nov 2023 15:37:44 +0800 From: oushixiong To: Maarten Lankhorst Cc: Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Shixiong Ou Subject: [PATCH] drm/atomic-helper: Call stall_checks() before allocate drm_crtc_commit Date: Mon, 6 Nov 2023 15:37:42 +0800 Message-Id: <20231106073742.158905-1-oushixiong@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Shixiong Ou Calling stall_checks() before allocating drm_crtc_commit not after that. Signed-off-by: Shixiong Ou --- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 2444fc33dd7c..94ea878b240d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2283,6 +2283,10 @@ int drm_atomic_helper_setup_commit(struct drm_atomic= _state *state, funcs =3D state->dev->mode_config.helper_private; =20 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state= , i) { + ret =3D stall_checks(crtc, nonblock); + if (ret) + return ret; + commit =3D kzalloc(sizeof(*commit), GFP_KERNEL); if (!commit) return -ENOMEM; @@ -2291,10 +2295,6 @@ int drm_atomic_helper_setup_commit(struct drm_atomic= _state *state, =20 new_crtc_state->commit =3D commit; =20 - ret =3D stall_checks(crtc, nonblock); - if (ret) - return ret; - /* * Drivers only send out events when at least either current or * new CRTC state is active. Complete right away if everything --=20 2.25.1