From patchwork Fri Jul 19 05:42:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 2830210 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 71E9D9F4D4 for ; Fri, 19 Jul 2013 05:44:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 882BF20377 for ; Fri, 19 Jul 2013 05:44:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BE25020374 for ; Fri, 19 Jul 2013 05:44:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D84CEE61D2 for ; Thu, 18 Jul 2013 22:44:56 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from shiva.localdomain (unknown [209.20.75.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D9FCE5CCC for ; Thu, 18 Jul 2013 22:43:03 -0700 (PDT) Received: by shiva.localdomain (Postfix, from userid 99) id A0C658867F; Fri, 19 Jul 2013 05:43:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lundgren.kumite (c-24-21-100-90.hsd1.or.comcast.net [24.21.100.90]) by shiva.localdomain (Postfix) with ESMTPSA id 2E40D8864E; Fri, 19 Jul 2013 05:42:55 +0000 (UTC) From: Ben Widawsky To: Intel GFX Date: Thu, 18 Jul 2013 22:42:49 -0700 Message-Id: <1374212570-7330-2-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.8.3.3 In-Reply-To: <1374212570-7330-1-git-send-email-ben@bwidawsk.net> References: <1374018073-6596-1-git-send-email-ben@bwidawsk.net> <1374212570-7330-1-git-send-email-ben@bwidawsk.net> Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Change uevent for reset completion X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Virus-Scanned: ClamAV using ClamSMTP Prior to this patch, we used ERROR=0 as a way of signifying the reset was complete. The functionality dates back quite a ways to: commit f316a42cc49eca73b33d85feb6177e32431747ff Author: Ben Gamari Date: Mon Sep 14 17:48:46 2009 -0400 drm/i915: Hookup chip reset in error handler I'm not really sure what the motivation for this was originally, but to me it makes more sense to have a distinct event for error detection, and another event for reset start/finish (since reset is prone to failure). Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9fe430a..03071d7 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1436,7 +1436,7 @@ static void i915_error_work_func(struct work_struct *work) struct drm_device *dev = dev_priv->dev; struct intel_ring_buffer *ring; char *reset_event[] = { "RESET=1", NULL }; - char *reset_done_event[] = { "ERROR=0", NULL }; + char *reset_done_event[] = { "RESET=0", NULL }; int i, ret; /*