From patchwork Wed Jul 19 12:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9851977 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 21AF360392 for ; Wed, 19 Jul 2017 12:56:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1424E2864F for ; Wed, 19 Jul 2017 12:56:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 091F628657; Wed, 19 Jul 2017 12:56:25 +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 AA0052864F for ; Wed, 19 Jul 2017 12:56:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 488236E54F; Wed, 19 Jul 2017 12:55:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 D188C6E51F for ; Wed, 19 Jul 2017 12:55:17 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id 143so596136wmu.5 for ; Wed, 19 Jul 2017 05:55:17 -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=VEceCqXuXrsynVfcJh0WEF3/t6EWA+XMDedIauBvpIc=; b=HYvcRNSrGqZ3I8JiTs14J5xChl17rdgoaqbZUKDql8hi5sL0a0Bdk6Hy2lpbItLUB8 uPzhnURc+fq9pQh4KfJ2WJw3KpnAmDWbHiunR50FpIien+tENbkrJukxG7cGXP3cw+Gf +S8XptxGV534iP/ii1I/H9af+p77q4cz52k74= 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; bh=VEceCqXuXrsynVfcJh0WEF3/t6EWA+XMDedIauBvpIc=; b=Ovh/Ifu5u7IlyM2a31mNVs8dF+erS8IjKCHWMLs2NpoAPomXwHltkaWokPb/2vwdMl /SmnMWyCIwZPXIM0Tm4zLlc3TzRGxoAUw2I2z2YDU+TCoNxTJrQlDkefP7LNrCDOzUkP vaEVuQYVx8kDzobOMGTul+UqhetNT/LdYlo4G0SkgS8t7CKiZph94tJUlFJ2TGANo9+M GvIlYoLxGFWwITJm86BQbMjGNSSr1OKMPc+82QBLq606KMqe2TKT7D2UpoWcvrb2z9Pb TLgQDuS74h93Io6zvR7oEfUzgD7/pIcvMDfRGsdOWpQhol8ExF4S0pExVwVI/qHtntX/ Eahw== X-Gm-Message-State: AIVw112y+oTQqv8FpLr40S3FNc6jTTfzeEjniJ441DU04fXoGqjJcHYT jyRl0yB0wDBkahECK2A= X-Received: by 10.80.131.101 with SMTP id 92mr382679edh.208.1500468916237; Wed, 19 Jul 2017 05:55:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id e46sm3069420edd.26.2017.07.19.05.55.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 05:55:15 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/9] drm/i915: Push i915_sw_fence_wait into the nonblocking atomic commit Date: Wed, 19 Jul 2017 14:54:57 +0200 Message-Id: <20170719125502.25696-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170719125502.25696-1-daniel.vetter@ffwll.ch> References: <20170719125502.25696-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Joonas Lahtinen , Daniel Vetter , Mika Kuoppala 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Blocking in a worker is ok, that's what the unbound_wq is for. And it unifies the paths between the blocking and nonblocking commit, giving me just one path where I have to implement the deadlock avoidance trickery in the next patch. Cc: Chris Wilson Cc: Mika Kuoppala Cc: Joonas Lahtinen Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 010a1f3e000c..5aa7ca1ab592 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12397,6 +12397,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) unsigned crtc_vblank_mask = 0; int i; + i915_sw_fence_wait(&intel_state->commit_ready); + drm_atomic_helper_wait_for_dependencies(state); if (intel_state->modeset) @@ -12564,10 +12566,7 @@ intel_atomic_commit_ready(struct i915_sw_fence *fence, switch (notify) { case FENCE_COMPLETE: - if (state->base.commit_work.func) - queue_work(system_unbound_wq, &state->base.commit_work); break; - case FENCE_FREE: { struct intel_atomic_helper *helper = @@ -12671,14 +12670,14 @@ static int intel_atomic_commit(struct drm_device *dev, } drm_atomic_state_get(state); - INIT_WORK(&state->commit_work, - nonblock ? intel_atomic_commit_work : NULL); + INIT_WORK(&state->commit_work, intel_atomic_commit_work); i915_sw_fence_commit(&intel_state->commit_ready); - if (!nonblock) { - i915_sw_fence_wait(&intel_state->commit_ready); + if (nonblock) + queue_work(system_unbound_wq, &state->commit_work); + else intel_atomic_commit_tail(state); - } + return 0; }