From patchwork Wed Oct 19 08:12:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9383709 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 EABD4600CA for ; Wed, 19 Oct 2016 08:12:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE0E529201 for ; Wed, 19 Oct 2016 08:12:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2AB829262; Wed, 19 Oct 2016 08:12:44 +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 87DE129201 for ; Wed, 19 Oct 2016 08:12:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB9656E08A; Wed, 19 Oct 2016 08:12:43 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8893A6E08A for ; Wed, 19 Oct 2016 08:12:36 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id d199so2769883wmd.1 for ; Wed, 19 Oct 2016 01:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sbKoxJTMcKAeJk7dFtw8bPNa3bxdvq2Jt769eM1NSkE=; b=nNBbq/Xa1zKJ5YbdQfLnIA9ws4U/TnErAU5n+rJgujD2J/zZ/PLN0oDV+k2TOx5m17 eH2YCEJRlyeaKqwYgFVupBbvJeecfYdIr6zprx3kBLq09Syi0OgD1Q0bgO1/8ckleXbF i8t3Ouo+nQuiR/JjU35bXojXjR9i+0OZLQLLnZoeKiVOmi88WBtUO503Q7Nbxw0HGiI2 /Q8Q7Y3XoVCyuAuo9rJmBMciObODU3v8IRR0V5Mt4dRS03GoAgS+SxkDY8web1DUeNx1 tGMl3fMlTwcfvECY+FfUatj1AAFgJ5ony8QQ+EMPC5BuZBMpaa2+pYhhaIY0/eAl94nR ozGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=sbKoxJTMcKAeJk7dFtw8bPNa3bxdvq2Jt769eM1NSkE=; b=e+34AtadAhfJz1TUbK8RdG7btX5ZyEE54M+UvD6iHchBYjEj1vszGGF3FiwvCMDnkq AgXWJyc3A1dwVdATfkycl4P5lg4+F36ETcC9NSFBtPBEYgQSHGpHqlrY3gWlcLwDdcf4 yt7rGyObvA0Cp4d6Agpo3ZmpQpl00VgDsa5h7lgqwqbqa5t0E8HvgHOF3ocE2TgzyiIp HBFuEmjbhPGBvnjepQkOFF8VNFQYQL9kDXnkoMxSIYqcFY9Ccm6g+KSBC67RRGuEQ0nQ QMsJ4j6FFr2ValRob40mQ+MZDa+1aZk7PY89QAoJMzgNNHpl5bxQ0U70Vh3cnSrbmQGN WGSw== X-Gm-Message-State: AA6/9RnD0L5z4uAlF3pkT/ynmCDnVUvklXQQkxsccMN/8SvQK1uWFriMENvEy16xZQe/yg== X-Received: by 10.28.180.70 with SMTP id d67mr1801654wmf.115.1476864754835; Wed, 19 Oct 2016 01:12:34 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id w74sm3665980wmf.13.2016.10.19.01.12.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Oct 2016 01:12:34 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 19 Oct 2016 09:12:28 +0100 Message-Id: <20161019081228.25533-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161019081228.25533-1-chris@chris-wilson.co.uk> References: <20161019081228.25533-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 2/2] drm/i915/gvt: Stop waiting whilst holding struct_mutex 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 For whatever reason, the gvt scheduler runs synchronously. At the very least, lets run synchronously without holding the struct_mutex. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/gvt/scheduler.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 4cedd3274da7..aa83dd3381a3 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -420,10 +420,6 @@ static int workload_thread(void *priv) intel_runtime_pm_get(gvt->dev_priv); - /* - * Always take i915 big lock first - */ - mutex_lock(&gvt->dev_priv->drm.struct_mutex); gvt_dbg_sched("ring id %d will dispatch workload %p\n", workload->ring_id, workload); @@ -432,7 +428,10 @@ static int workload_thread(void *priv) intel_uncore_forcewake_get(gvt->dev_priv, FORCEWAKE_ALL); + mutex_lock(&gvt->dev_priv->drm.struct_mutex); ret = dispatch_workload(workload); + mutex_lock(&gvt->dev_priv->drm.struct_mutex); + if (ret) { gvt_err("fail to dispatch workload, skip\n"); goto complete; @@ -442,8 +441,7 @@ static int workload_thread(void *priv) workload->ring_id, workload); workload->status = i915_wait_request(workload->req, - I915_WAIT_LOCKED, - NULL, NULL); + 0, NULL, NULL); if (workload->status != 0) gvt_err("fail to wait workload, skip\n"); @@ -451,13 +449,14 @@ static int workload_thread(void *priv) gvt_dbg_sched("will complete workload %p\n, status: %d\n", workload, workload->status); + mutex_lock(&gvt->dev_priv->drm.struct_mutex); complete_current_workload(gvt, ring_id); + mutex_unlock(&gvt->dev_priv->drm.struct_mutex); if (need_force_wake) intel_uncore_forcewake_put(gvt->dev_priv, FORCEWAKE_ALL); - mutex_unlock(&gvt->dev_priv->drm.struct_mutex); intel_runtime_pm_put(gvt->dev_priv); }