From patchwork Fri Nov 10 10:53:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10052817 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 E6A896035D for ; Fri, 10 Nov 2017 10:53:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D60C028907 for ; Fri, 10 Nov 2017 10:53:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAF4D2B258; Fri, 10 Nov 2017 10:53:41 +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=unavailable 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 9BBCE28907 for ; Fri, 10 Nov 2017 10:53:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C578F6EA3D; Fri, 10 Nov 2017 10:53:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D34C6EA3D for ; Fri, 10 Nov 2017 10:53:38 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id b189so1839080wmd.4 for ; Fri, 10 Nov 2017 02:53:38 -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=QZiDnSGv1TqcBPfAG8lAzV+e6T+q6OPMFxE229ByEX4=; b=S0Uz5tmgLDoe3ZrsrTANQFZ+doremznDcc5DteG2fB1nkuK1kim5PwD/sEaYIuihga 30SUlFZh6rjN0GxseOnLZ7kBZT3Cz9iPi0r7Z2PDfKICMxBJ6l5O+VBc4GWrc1s/S7t+ /wTkmTxLeT6GELZ/Se4QzGT2B5A7jyOEeoUZI= 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=QZiDnSGv1TqcBPfAG8lAzV+e6T+q6OPMFxE229ByEX4=; b=TcL1VZ+FItESUK2z898MspWTz909eCWmHIeqiLFgfpLPwGQXrBDiuAkJb2C3taYjan tEvbCZ/KHQ9XwZFRDHLZlHdFo7vGmVVE/pQB2U6t8Gp1LO3xXYjiN783JRt1st0pFvOs UCO0BtVhTMiV/AqSyTSnXC4E8dpVT+FFBptGJHdOvGMRXISgILEwucRq5K/4TQXWgEqf 1xjPb7FbmCpNrv8ENiY0TxxPXHequ6we50FStGsIsJEfdv/zY+t+2wnAztGphlBk82Pc MQMQtrPOkXynbAImK1GZXI+TYR0NJYytSga7G6W4QuOa4INhTbyHLY+WVEACK5muMEjv NubQ== X-Gm-Message-State: AJaThX5CrK5GaE4s/lgeDSCUfxsYC1wdp1+iOixcOZkIiQ+ZOPkAsAIi hdc6eXW80Zzqrp4ChhKloZopWQ2o X-Google-Smtp-Source: AGs4zMYcEC7nJfic2o51cST0EUfJmo4nyPrD+tZ+cK7gzlyjBK+h+y6pOYzcPfEdnrVlkwg7lAnPZg== X-Received: by 10.80.152.229 with SMTP id j92mr2039365edb.279.1510311216573; Fri, 10 Nov 2017 02:53:36 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id t10sm7786436edb.92.2017.11.10.02.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 02:53:35 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/2] drm/atomic-helper: always track connector commits, too Date: Fri, 10 Nov 2017 11:53:12 +0100 Message-Id: <20171110105313.16718-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. v2: Make it work (Manasi&Ville) Cc: Manasi Navare Cc: Maarten Lankhorst Cc: Ville Syrjälä Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_helper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index c18c271e7508..ced1ac8e68a0 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1793,11 +1793,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_conn_state->commit->flip_done)) return -EBUSY; - /* commit tracked through new_crtc_state->commit, no need to do it explicitly */ - 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; @@ -1811,10 +1808,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;