From patchwork Fri Sep 9 07:21:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9322525 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 E96D56077F for ; Fri, 9 Sep 2016 07:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D58A429C8F for ; Fri, 9 Sep 2016 07:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA53D29C92; Fri, 9 Sep 2016 07:21:36 +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 EE6B029C8F for ; Fri, 9 Sep 2016 07:21:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DBE76E6DD; Fri, 9 Sep 2016 07:21:35 +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 7EEB86E6B5 for ; Fri, 9 Sep 2016 07:21:32 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id w12so1397138wmf.1 for ; Fri, 09 Sep 2016 00:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=BH1uSC3SErg9NXmxRdLCpmLoiPcF5uHFGs4S7+m27F0=; b=Fpzjtk3HUmow8S0Hqn/Ky5pdBpafj9Z8fwh59bqDI4P9S5sYTVylpBip0uadr8qI7a ZDlVZAyejxseYRYolLXNM/rN1ZiBILxubI0IggLOnDR1Up56ryQSYzSbg4NZCI15AQiN wqTpM36ATq/6m772OM6a4YeePM0Xm6I9dtAJo0aGZ6XJ+yNy+gYQEnsqEf0+kSrXQA7f FmdGGTn2ujAvmOTjfosBwp/UJFq4z84J/SeBSLN5nulnlSfqP7v+bfmzVorNolKD5rkF 6rL34GFGBf8ZIAIS+c8bFsmu0t7w+ETJNub9pZWFciDiAV3LS/xMu7MzKRJP2V9GhpXt 749A== 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:subject:date:message-id :in-reply-to:references; bh=BH1uSC3SErg9NXmxRdLCpmLoiPcF5uHFGs4S7+m27F0=; b=eozWij6EkuVM4BLTcwd4nKOxPOYyBr1T/Rsg7F8PVdB52MuSA1nsmw2lXPrpeZopsr CGv28h6+1vUHXDbi6ZG0xlOxoqsQ/AZtcTUwqyWD0DIPZ2hhRQO19hJZI85GAM91dGl+ /q0tymySOHu0QAOIO4JSPgqOzZy81EG2DkNgd1Xonu6nEPZxWa4vYetWb2EdwT5bGe81 sS4ptZZKmnpuKA3ZWyfBJiOoxMoLEhpdgPd5bfNBSGCd/PRq/suPVxoP0IuxAsUiSzU7 rsjkgxE5rPrELpFkUsw0S1Mdgb38uiMCMl4Mk2/UnlfULv4nwkqhgbp84E51QNj5Yirk krrQ== X-Gm-Message-State: AE9vXwOhdijj5Ish/zzdMoiGxgpxkym5bznbWL2pSmrCHYZyD8//DBVFUv2BafxjDA4I8g== X-Received: by 10.194.73.99 with SMTP id k3mr1611822wjv.63.1473405690899; Fri, 09 Sep 2016 00:21:30 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id kk6sm1891592wjb.44.2016.09.09.00.21.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 00:21:29 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 9 Sep 2016 08:21:04 +0100 Message-Id: <20160909072107.18861-18-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160909072107.18861-1-chris@chris-wilson.co.uk> References: <20160909072107.18861-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 18/21] drm/i915: Ignore valid but unknown semaphores 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 If we find a ring waiting on a semaphore for another assigned but not yet emitted request, treat it as valid and waiting. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_irq.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ef2d40278191..b76d45d91a84 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2831,10 +2831,10 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, } } - DRM_ERROR("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n", - engine->id, ipehr, offset); + DRM_DEBUG_DRIVER("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n", + engine->id, ipehr, offset); - return NULL; + return ERR_PTR(-ENODEV); } static struct intel_engine_cs * @@ -2922,6 +2922,9 @@ static int semaphore_passed(struct intel_engine_cs *engine) if (signaller == NULL) return -1; + if (IS_ERR(signaller)) + return 0; + /* Prevent pathological recursion due to driver bugs */ if (signaller->hangcheck.deadlock >= I915_NUM_ENGINES) return -1;