From patchwork Sun May 29 18:35:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9139927 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 8767D60759 for ; Sun, 29 May 2016 18:36:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D66627CF9 for ; Sun, 29 May 2016 18:36:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7287C281F9; Sun, 29 May 2016 18:36:32 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3641027CF9 for ; Sun, 29 May 2016 18:36:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06BF06E594; Sun, 29 May 2016 18:35:57 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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 4B0BA6E5A8 for ; Sun, 29 May 2016 18:35:54 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id q62so16089755wmg.3 for ; Sun, 29 May 2016 11:35:54 -0700 (PDT) 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; bh=4JjRxkLZQVwHWWSJQpiygC7a0E9+CuPx3/+QEHzffks=; b=DkoQdaYX9IT4RbQbeor84S2E55y81zLh6mm7f49xtpdRlJc/q5uZqyaZmOK2PRj7C5 0ny8X9g/GZnuD1/UTc9PoBaFI7UprRMI5utBwieWx9p9NEmQLKz/8DuY1jOw/4nSoRkI k9X26t5MPQW66cF/UUAkBdZ/C9AOxb00ikg/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4JjRxkLZQVwHWWSJQpiygC7a0E9+CuPx3/+QEHzffks=; b=f2fwP28kuyERo3O8B/raTBhshODAWGs5VVPDixsBPXgS4fFDzAbl0u+skVruBX9JQ9 j3Y1Dlqim24kVxH1VFcwM8OEATYbDlQWEN74UzhwlbdLwgEZsdpXw7KI0YcdmU+a0ugJ bm4d0l3qVHgvfS7Ko7LQyo11nWHdmJhe4H9xDoB/YWsT8kswLSSPPO08Sz2Dv5dQPqKj 8tdwVPWUrPpSk6dHJQQbCId15uY6G8o+BCBJXwFVEAT0yIyBUkzgQ6TQK8hEeIWGWg4L ADEaSCB31ZT09x59N5RI04eYIDwVyu7slHEKUZcFMd/TQcVCW7XhysRGhl1n/kyb/Vjm 5Hvg== X-Gm-Message-State: ALyK8tKKYynCAmdSjD718yX4j11ASxSZI42S6Jdu0yxQX9eFScQJ0MZopnJTJ5USeX64bQ== X-Received: by 10.194.248.97 with SMTP id yl1mr8799268wjc.130.1464546952271; Sun, 29 May 2016 11:35:52 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id h2sm7761550wjv.15.2016.05.29.11.35.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2016 11:35:51 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Sun, 29 May 2016 20:35:20 +0200 Message-Id: <1464546923-13439-24-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464546923-13439-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464546923-13439-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 23/26] drm/i915: Roll out the helper nonblock tracking 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Right now still all blocking, no worker anywhere to be seen. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 66a254fa2a96..4b81cffef24e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13654,6 +13654,10 @@ static int intel_atomic_commit(struct drm_device *dev, unsigned long put_domains[I915_MAX_PIPES] = {}; unsigned crtc_vblank_mask = 0; + ret = drm_atomic_helper_setup_commit(state, nonblock); + if (ret) + return ret; + ret = intel_atomic_prepare_commit(dev, state, nonblock); if (ret) { DRM_DEBUG_ATOMIC("Preparing state failed with %i\n", ret); @@ -13665,6 +13669,8 @@ static int intel_atomic_commit(struct drm_device *dev, dev_priv->wm.skl_results = intel_state->wm_results; intel_shared_dpll_commit(state); + drm_atomic_helper_wait_for_dependencies(state); + if (intel_state->modeset) { memcpy(dev_priv->min_pixclk, intel_state->min_pixclk, sizeof(intel_state->min_pixclk)); @@ -13760,7 +13766,7 @@ static int intel_atomic_commit(struct drm_device *dev, crtc_vblank_mask |= 1 << i; } - /* FIXME: add subpixel order */ + drm_atomic_helper_commit_hw_done(state); if (!state->legacy_cursor_update) intel_atomic_wait_for_vblanks(dev, dev_priv, crtc_vblank_mask); @@ -13795,6 +13801,8 @@ static int intel_atomic_commit(struct drm_device *dev, drm_atomic_helper_cleanup_planes(dev, state); mutex_unlock(&dev->struct_mutex); + drm_atomic_helper_commit_cleanup_done(state); + drm_atomic_state_free(state); /* As one of the primary mmio accessors, KMS has a high likelihood