From patchwork Wed Nov 8 10:54:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10048277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1841E6032D for ; Wed, 8 Nov 2017 10:55:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 110E8292F1 for ; Wed, 8 Nov 2017 10:55:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 048E42A577; Wed, 8 Nov 2017 10:55:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8BBB029460 for ; Wed, 8 Nov 2017 10:55:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 515946E0ED; Wed, 8 Nov 2017 10:54:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B0936E0ED for ; Wed, 8 Nov 2017 10:54:58 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id b9so9865621wmh.0 for ; Wed, 08 Nov 2017 02:54:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=717/OCv046Xv70Kx9rYQFt3tTOG5kA//1GJXJduvIxo=; b=lgl+mXbrBn5UIDFBcgF8Mz79LqJnFZREG47r+IW3HaB6G53QrggWELhJCtMTNG5fUb DOxHvYdLEzGZawdNVw8Zh13W1Cb5G4kwTjhQMK6oObd4yy3/fIJ2Z7z8xGGgAGJ7Hwyh HBsLj9ooKsqjFmRr2nnR/uDyGPtA3QBKGmOSY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=717/OCv046Xv70Kx9rYQFt3tTOG5kA//1GJXJduvIxo=; b=lqhJEUn//46myEXzYZWHvbSTBxow97KfURhFglkX8DO7VwbhUTXl3nDOXKHxPhoeRT oUwjZjTExSKHijrP566x6WyPoAuGZpcpWNOsd4NUvVMH4H7Wg4nbvOHzAMzyYVnTHplO 89GY5ZuMjiyTcpw9Ehz6UXTb7ui1XoJRuP0oQsnjmjj0XnINe1hOSSd1IIbn4HAEM6Jp TkUjXNQzdRTWys68GqPY4gCE2+GU1i103ktHiIMTV/m/jcBONJiCi+xa2n5fnDZxZtAX tQgotfR85G6LzEWor7Ip1hpXRi5z0xPCQ2JpNdE8EHYkx6Dj7WFYHjLlXFav/APsdpxo 2M/A== X-Gm-Message-State: AJaThX5jb8kgP2pUDiBkCM/mjV6rJ5sb6A6+wKTnRcJ0uSmMPoOR4bX1 ROZ2ebOYf1tGPdaM7LO0S2CdoR91 X-Google-Smtp-Source: ABhQp+SNUipVBT2hCc6Mu7jk5evFxZF0YhgFFWSHigwGJmNc1Bvcsni868QfBiw9aV8cmiTjgb8cGg== X-Received: by 10.80.134.111 with SMTP id 44mr106796edt.69.1510138496444; Wed, 08 Nov 2017 02:54:56 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id r15sm3657767edi.52.2017.11.08.02.54.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 02:54:55 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/2] drm/atomic-helper: always track connector commits, too Date: Wed, 8 Nov 2017 11:54:49 +0100 Message-Id: <20171108105450.20339-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.0 MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , Manasi Navare , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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" X-Virus-Scanned: ClamAV using ClamSMTP It's useful for syncing async connector work like link retraining. Cc: Manasi Navare Cc: Maarten Lankhorst Cc: Ville Syrjälä Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_helper.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 71d712f1b56a..ea781d55f2c1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1791,7 +1791,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, if (new_conn_state->crtc) continue; - commit = crtc_or_fake_commit(state, old_conn_state->crtc); + /* Always track connectors explicitly for e.g. link retraining. */ + commit = crtc_or_fake_commit(state, new_conn_state->crtc ?: old_conn_state->crtc); if (!commit) return -ENOMEM; @@ -1805,10 +1806,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_plane_state->commit->flip_done)) return -EBUSY; - /* - * Unlike connectors, always track planes explicitly for - * async pageflip support. - */ + /* Always track planes explicitly for async pageflip support. */ commit = crtc_or_fake_commit(state, new_plane_state->crtc ?: old_plane_state->crtc); if (!commit) return -ENOMEM;