From patchwork Wed Oct 1 09:15:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5010511 Return-Path: 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 511AE9F327 for ; Wed, 1 Oct 2014 09:15:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6EFA52013D for ; Wed, 1 Oct 2014 09:15:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1C25620136 for ; Wed, 1 Oct 2014 09:15:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 685F36E19A; Wed, 1 Oct 2014 02:15:23 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 91EA26E19A for ; Wed, 1 Oct 2014 02:15:21 -0700 (PDT) Received: by mail-wi0-f175.google.com with SMTP id d1so19495wiv.14 for ; Wed, 01 Oct 2014 02:15:20 -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=ZM+djQbccXyyr9oXKKTTlvRWNnMsEpYViRNGlLXaVG4=; b=b6kYXXhtrU7bDwlMBbNjOVPNQtrMFGIbkXVo3VScXlm+HDGRkwg+0l5ginIa787cZn tGnRkMkK08S5//eNpmuo06Oj4yhpU3mlelYxKiBWB4K/cguTsJ/scMrpXYCX1XFEJL4n ih1G6pGT08qxpeNkbGhwVbdy1pMkDkkYpbNA0= 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=ZM+djQbccXyyr9oXKKTTlvRWNnMsEpYViRNGlLXaVG4=; b=WDnvlP7mO1SZ5PrqEYUXg7ktj0++Q9y4eUoivL1HKTzVzVI8/CpbTBecfaeA5iWKzS V2YazdnpykQTAUz0OlzYjbnQToq6sjwmdPBIPqXwSqqcbpr3nNveKf0u1Nw4+xRfi4vZ Y4rUKVf+LP/jiATo9tYyVYO5shmVpZ4HIEBqr1aStQxE4WatG8de961OosNW2vfPGU9q tNqQwYxBVCARkCs0Svy5F9VN4GBmyIeVvyqvAyph9iGyyXBi2of/Rho7E+nEu2DTg4hL MAd5yK2vqo5FJ69zhSsBTCuVLMBEFSky1NNJYoI6amQgz7YlwqwyGAtTTPHCr87+EKNk DAXA== X-Gm-Message-State: ALoCoQnR6x/ZEy895hZHU2S0sZaPljzuClKZpvfHTnZ3dvPjJYFRCqh721BOgWhrIy5vCQQRQmX3 X-Received: by 10.194.119.9 with SMTP id kq9mr59380597wjb.25.1412154920044; Wed, 01 Oct 2014 02:15:20 -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 mz16sm1170948wic.13.2014.10.01.02.15.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Oct 2014 02:15:18 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 1 Oct 2014 11:15:12 +0200 Message-Id: <1412154912-19123-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.c> References: <1412118259-4860-1-git-send-email-daniel.vetter@ffwll.c> Cc: Daniel Vetter , Daniel Vetter , Mika Kuoppala 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 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-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 This seems to have been accidentally lost in commit be62acb4cce1389a28296852737e3917d9cc5b25 Author: Mika Kuoppala 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. Cc: Mika Kuoppala Cc: Chris Wilson Cc: Kenneth Graunke Reported-by: Kenneth Graunke Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ea93ff151a74..57c1f5608462 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 { + DRM_ERROR("Reset chip after gpu hang\n"); } if (ret) {