From patchwork Thu Nov 9 08:57:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10050509 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 515FD60381 for ; Thu, 9 Nov 2017 08:57:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 403042ABF2 for ; Thu, 9 Nov 2017 08:57:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 345752ABF5; Thu, 9 Nov 2017 08:57:20 +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 C30912ABF2 for ; Thu, 9 Nov 2017 08:57:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65F3B6E858; Thu, 9 Nov 2017 08:57:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2E9F6E860 for ; Thu, 9 Nov 2017 08:57:18 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id p75so15456146wmg.3 for ; Thu, 09 Nov 2017 00:57:18 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=QZiDnSGv1TqcBPfAG8lAzV+e6T+q6OPMFxE229ByEX4=; b=VtEzFyAZ6+rlolXo/986ndyVSUlgf13HGH3SCBz+GRZOC9HNyTUCQGV0NtQm7sNIrp FyYlkxnvSZsSwrgshKST/nGwLlnHTJxfbWA5bS/ov3M53wGTFPRJxVSXy7V/+xqhGlXT fVvqoz5DinxB85/fsu3AYp4nAcWx9lLlHpCoA= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QZiDnSGv1TqcBPfAG8lAzV+e6T+q6OPMFxE229ByEX4=; b=mKAeSheSyYcW+8ArNhZV5Ys5BL40QMmJUu/3HRhkbysWYI6Pidlx7x8VMYNwMTa7JR NnE1nrHFML8+tAqiFu8z49kCr6/fciv+nFAF4Go5IEIZSItrFbFvEwZFwgDaBAeIINz1 fFhNU3Kcgw3mYwRzn9GV728al6mYAHKbROgSFHPD3wbuLPxbAOiPZfVwffVgjRqih5yG rflYReItN2hEp9hidQXUDH27wZetOQteI/cbAF/hjk6gaynM0nG26pvNtAirZkntRF6w Zfv9ux6YKDHneJjaAFdzL7JGWIMCJwUVAssgTfF8va9BqQi+ILQZu6jvQd0+RCx1WKzo rWHg== X-Gm-Message-State: AJaThX6n9sS18brmyitwVzT96AoMc4iTBkLJqptdIJf4FAhRnG72veyL 5Is70QgmKRkcn0orBUfWvicDx2Fx X-Google-Smtp-Source: ABhQp+TSu2CErw47ZxRKHhY99uVUW1gp8WTJEm6h0TXgfgIyUDLVHgMxRwiQ0vokKXqZOFLbnEWKZA== X-Received: by 10.80.216.5 with SMTP id o5mr4221613edj.235.1510217837320; Thu, 09 Nov 2017 00:57:17 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id i17sm5178183ede.64.2017.11.09.00.57.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Nov 2017 00:57:16 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Thu, 9 Nov 2017 09:57:11 +0100 Message-Id: <20171109085711.9589-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171108105450.20339-1-daniel.vetter@ffwll.ch> References: <20171108105450.20339-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/atomic-helper: always track connector commits, too X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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;