Message ID | 1412155727-19849-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 164089F348 for <patchwork-intel-gfx@patchwork.kernel.org>; Thu, 2 Oct 2014 04:01:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47D7020259 for <patchwork-intel-gfx@patchwork.kernel.org>; Thu, 2 Oct 2014 04:01:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4704A20200 for <patchwork-intel-gfx@patchwork.kernel.org>; Thu, 2 Oct 2014 04:01:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D97C16F7EC; Wed, 1 Oct 2014 20:57:51 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by gabe.freedesktop.org (Postfix) with ESMTP id BBC386E333 for <intel-gfx@lists.freedesktop.org>; Wed, 1 Oct 2014 02:28:56 -0700 (PDT) Received: by mail-wg0-f46.google.com with SMTP id k14so637815wgh.5 for <intel-gfx@lists.freedesktop.org>; Wed, 01 Oct 2014 02:28:55 -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=UrOtNUePrKj5tdkgoYBQe5FYW4DckeJd9c+L22b0QOU=; b=btwZJKxvuJe87EZgVzJxJF66nJdkIAJu3L/xYzGIIUo4j+NtlBaLJ2OvKolJ4kx1zF fTllqPVeIKiTNTEH1t98Kd9eKoAurtGsqtrAVp+pgCHwE4rWg++GJ0D75pFFpL7n23oc Ve4r8taRuKhy2mdaYdf0VBoi9+ir4YfTvZpTk= 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=UrOtNUePrKj5tdkgoYBQe5FYW4DckeJd9c+L22b0QOU=; b=ePbiQka0GQXc+jTVx/vqLuQ/BUVgrcojdgaE7Uqv8pBATW3CP7s3lBPpj7J2e0jfL4 QrRKIYfZUNtnJe1R5My+XLOK8sAWf5XwqJRPAG4U7ZmQj0tiGwVSCaiZlZx7yIDeRX4q RfWq6OyvDV+4GtoIjoxUvkkhw0j5PBX5XxVH+tcXqcWuuQjuKbu/CISyHAXAYlc4LwgW MtfO94rtic8grHlQFqaxbcq43RtzbtUjwsr4U7RkzYCZd7nT+PU0Qow9uByru5anVym8 jYbaoTHKCmLvcHRmQOK4YR9QQXwjZH7OtpXS/DTsh4i7BIUDvCuwvbpcseJ4GHvlXr6A SALA== X-Gm-Message-State: ALoCoQmWm0sdt5WMGcWpdgsTJqZU0BUHUE5+FN5AALffNJHnQwX7Fqaj0FqH1bjX8J2eqzFAVV2c X-Received: by 10.180.106.232 with SMTP id gx8mr12881336wib.34.1412155735504; Wed, 01 Oct 2014 02:28:55 -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 d6sm1226599wiz.0.2014.10.01.02.28.53 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Oct 2014 02:28:54 -0700 (PDT) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: Intel Graphics Development <intel-gfx@lists.freedesktop.org> Date: Wed, 1 Oct 2014 11:28:47 +0200 Message-Id: <1412155727-19849-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..c9703816da28 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: Reset 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. 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(+)