From patchwork Fri Sep 9 07:21:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9322527 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 C043E6077F for ; Fri, 9 Sep 2016 07:21:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACC3729C4F for ; Fri, 9 Sep 2016 07:21:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1CB429C90; Fri, 9 Sep 2016 07:21:37 +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 CB02529C4F 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 35C086E6D5; 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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id BAC256E6DA for ; Fri, 9 Sep 2016 07:21:33 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b187so1406668wme.0 for ; Fri, 09 Sep 2016 00:21:33 -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=79ilx5Q30jc2RO7oNzAfwCNZDVclYLQv64VvDeN1oH4=; b=RZp3VCfXbj8LFc8UBUtJaDkQKHUOG5+dxDoVypn3ujQgd83h4acvfwQzxTfPU//mku 32A6QbLZQy9zqAyt4/++cnbBh3l9szo5IbuB7dHM8ZEdx59rwxrG7KRf668gjIlKDBXH lfKgBET3WEBj2StXq6209jyXsY5KtHZ80VfdmwEeQeRaGcJnMJtsHV1mxsHrsXtuYiSl JdvdjMk1ORWnIF7XXvQWgg8lhB5pef9xFQNAqKvIPneK6Phe6YUGoW73XF2xHqH7g54M JTf4vm4bsa57TC4kavGAybvOwR+k2cU28C9jRKTz/Qyl5vIGQnN8UNiisqhz4f1I6zso 1zEQ== 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=79ilx5Q30jc2RO7oNzAfwCNZDVclYLQv64VvDeN1oH4=; b=UTOoWUW3cQKAqSlUv62St9mNQ9lizN7a0BKVfOj+IwdxtF+b0Glu9bzcQqU3WHYbWn gv0M77OCTg6EZ2equa6035oI44pGyjMg0boL92EcB3J1GGU7Hrpg/OiAAMwHXYVMQ5Xg epPG5UL9OCm3ZJuseYOTThklEub9/qoeaipAMqMzB07IIlY5Wxrqmzv44vJ6680Ky6tY Qqa2M8MZUTaZngEeu6PQhg8K2fB1BoPuqpbj/rJGc7GP0P8O00TIyaGfmhn7u1IwYJRG nYAtABtr8odVtM2FJ7SB5VXfq+VOD1soxnQKTGemiJPRCu6G+Ej8ej8mDe2lpzLfWtgb Unew== X-Gm-Message-State: AE9vXwNYPUPebABf7aBIuElUpkXTg0FrmSc+4cPN26BybIVEy/SD4L0l9DOEDEOnV9awdA== X-Received: by 10.28.65.84 with SMTP id o81mr1316246wma.83.1473405692201; Fri, 09 Sep 2016 00:21:32 -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.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 00:21:31 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 9 Sep 2016 08:21:05 +0100 Message-Id: <20160909072107.18861-19-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 19/21] drm/i915: Avoid incrementing hangcheck whilst waiting for external fence 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 are waiting upon an external fence, from the pov of hangcheck the engine is stuck on the last submitted seqno. Currently we give a small increment to the hangcheck score in order to catch a stuck waiter / driver. Now that we both have an independent wait hangcheck and may be stuck waiting on an external fence, resetting the GPU has little effect on that external fence. As we cannot advance by resetting, skip incrementing the hangcheck score. Signed-off-by: Chris Wilson Cc: Mika Kuoppala --- drivers/gpu/drm/i915/i915_irq.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b76d45d91a84..8462817a7dae 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3099,10 +3099,6 @@ static void i915_hangcheck_elapsed(struct work_struct *work) if (engine->hangcheck.seqno == seqno) { if (i915_seqno_passed(seqno, submit)) { engine->hangcheck.action = HANGCHECK_IDLE; - if (busy) { - /* Safeguard against driver failure */ - engine->hangcheck.score += BUSY; - } } else { /* We always increment the hangcheck score * if the engine is busy and still processing