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 7D60DC43219 for ; Fri, 30 Sep 2022 09:04:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 239D910EBBB; Fri, 30 Sep 2022 09:04:19 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC61310EBBB for ; Fri, 30 Sep 2022 09:04:14 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4BF551F8CE; Fri, 30 Sep 2022 09:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1664528653; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=m+7bjWngT/acd7XuH2s4irumsDCR0yvEOjKuHlmCanY=; b=PTmugBAWdyyMkaOAUvwm9s6yguh/YjHV1Tu75ovnQhkUSlrYEDwJ9m++uitIsNNTzpUx5l VqzfEQX9/Z4WcSz1CxCpKn7sAlSS3UajHsQ94H3a68xsNJmWqcI+doQW25/uqqdTf3rX/P qeVbnh993v9dfluH3H+FqczArRh0wGI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1664528653; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=m+7bjWngT/acd7XuH2s4irumsDCR0yvEOjKuHlmCanY=; b=gQeIXky9U4EC2EJ46M3VEO1laqRCfn7HJ6ikilZ05yvWeDkei6Roi6PKw+emfHADOmOXey hdCaEm/skJ/AeTDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 15BD713776; Fri, 30 Sep 2022 09:04:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dmFmBA2xNmObUwAAMHmgww (envelope-from ); Fri, 30 Sep 2022 09:04:13 +0000 From: Thomas Zimmermann To: jfalempe@redhat.com, daniel@ffwll.ch, airlied@gmail.com, ville.syrjala@linux.intel.com, daniel@fooishbar.org, javierm@redhat.com, mripard@kernel.org, maarten.lankhorst@linux.intel.com Subject: [PATCH v2] drm/atomic-helper: Don't allocated plane state in CRTC check Date: Fri, 30 Sep 2022 11:04:11 +0200 Message-Id: <20220930090411.20198-1-tzimmermann@suse.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Cc: David Airlie , Thomas Zimmermann , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In drm_atomic_helper_check_crtc_state(), do not add a new plane state to the global state if it does not exist already. Adding a new plane state will result in overhead for the plane during the atomic-commit step. For the test in drm_atomic_helper_check_crtc_state() to succeed, it is important that the CRTC has an enabled primary plane after the commit. This can be a newly enabled plane or an already enabled plane. So if a plane is not part of the commit, use the plane's existing state. v2: * remove unnecessary test for plane->crtc (Ville) * inline drm_atomic_get_next_plane_state() (Ville) * acquire plane lock before accessing plane->state (Ville) Signed-off-by: Thomas Zimmermann Fixes: d6b9af1097fe ("drm/atomic-helper: Add helper drm_atomic_helper_check_crtc_state()") Cc: Thomas Zimmermann Cc: Jocelyn Falempe Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 98cc3137c062..b7774a39712b 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -960,10 +960,18 @@ int drm_atomic_helper_check_crtc_state(struct drm_crtc_state *crtc_state, if (plane->type != DRM_PLANE_TYPE_PRIMARY) continue; - plane_state = drm_atomic_get_plane_state(state, plane); - if (IS_ERR(plane_state)) - return PTR_ERR(plane_state); - if (plane_state->fb && plane_state->crtc) { + + plane_state = drm_atomic_get_new_plane_state(state, plane); + if (!plane_state) { + /* plane isn't part of the update; look at existing state */ + int ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); + + if (ret) + return ret; + plane_state = plane->state; + } + + if (plane_state->fb) { has_primary_plane = true; break; } -- 2.37.3