Message ID | 1412155928-19973-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <intel-gfx-bounces@lists.freedesktop.org> X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2810B9F327 for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 1 Oct 2014 09:32:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 493542015A for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 1 Oct 2014 09:32:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2C5B120155 for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 1 Oct 2014 09:32:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A3666E2DC; Wed, 1 Oct 2014 02:32:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 876C06E2DC for <intel-gfx@lists.freedesktop.org>; Wed, 1 Oct 2014 02:32:18 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id ho1so100946wib.4 for <intel-gfx@lists.freedesktop.org>; Wed, 01 Oct 2014 02:32: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=cSC9J670wwnzeRQMVjVhxri43+K5jumY71Av4zZMc/A=; b=PL7kkEPwoSHkhzQsECqupX1iCdst2TTqglPnQL7UA/c+FOed0UA2+BjUb+8DjNtKQG MyVq0pWmnpjO9T0ZrFF7kK/xuZ2GZv8petAEx9KQ+NJOZX+Tx2G9/eN84Ls6z3835TZ2 2WvoyqJsuTUstV1o+Ct4mwuQalqOEE9orowWo= 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=cSC9J670wwnzeRQMVjVhxri43+K5jumY71Av4zZMc/A=; b=fcZJPvyGp598O8mUauaRTFX2aG2U7BlsceS0J3VsrmqWckvSK11aWPsL29PuWpPYTx ERG5myPkFe9kqkeDfASPyqMcgE8ePfB8MXRuAUQ2hz0jwyB+elCl2OB1Fjobb59G6K5X l9BQ2FI9b+2XGqH06dQW6fhV1CXR/1WaKSpfZ4s2yYFLDgQ7LuuZKAJxbsb9p2CLP9C/ chY6n6dDo9pnDnRSSuwHu2AAov7tkRkd1xhF+VlpuPbgtyizM2xGMn1X9TDwkfx2v3KN liAh2cKahWjuJZuWhVfuOrmqGkpxneWozOiiZ3Q6hgCAwiEca06onaFI0NghflebbkPn 2uuw== X-Gm-Message-State: ALoCoQnXnyR6BTnt1303Ncu/sbCc1VTVg4QFGNWIuVunRHOfZzGDSlY1Hk1w/7Bv/HygB7xNiGv9 X-Received: by 10.180.8.73 with SMTP id p9mr2930538wia.32.1412155937527; Wed, 01 Oct 2014 02:32:17 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id fv1sm506878wjb.35.2014.10.01.02.32.15 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Oct 2014 02:32:16 -0700 (PDT) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: Intel Graphics Development <intel-gfx@lists.freedesktop.org> Date: Wed, 1 Oct 2014 11:32:08 +0200 Message-Id: <1412155928-19973-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1412118259-4860-1-git-send-email-daniel.vetter@ffwll.ch> References: <1412118259-4860-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter <daniel.vetter@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Mika Kuoppala <mika.kuoppala@intel.com> Subject: [Intel-gfx] [PATCH] drm/i915: Reinstate error level message for non-simulated gpu hangs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development <intel-gfx.lists.freedesktop.org> List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <http://lists.freedesktop.org/archives/intel-gfx> List-Post: <mailto:intel-gfx@lists.freedesktop.org> List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help> List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org> X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ea93ff151a74..a77b6608a271 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -842,6 +842,8 @@ int i915_reset(struct drm_device *dev) "error for simulated gpu hangs\n"); ret = 0; } + } else { + pr_notice("drm/i915: Resetting chip after gpu hang\n"); } if (ret) {
This seems to have been accidentally lost in commit be62acb4cce1389a28296852737e3917d9cc5b25 Author: Mika Kuoppala <mika.kuoppala@linux.intel.com> Date: Fri Aug 30 16:19:28 2013 +0300 drm/i915: ban badly behaving contexts Without this real gpu hangs only log output at info level, which gets filtered away by piglit's testrunner. v2: Tune down to notice level. Note that we need to add drm/i915 so that at least the automatic igt dmesg filtering still picks it up. v3: git add and lack of coffee don't mix well. v4: Message is in between hw and sw reset, so switch verb to continuous form. Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Kenneth Graunke <kenneth@whitecape.org> Reported-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ 1 file changed, 2 insertions(+)