From patchwork Fri Dec 13 17:22:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3341871 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 4A5639F380 for ; Fri, 13 Dec 2013 17:22:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B429D20711 for ; Fri, 13 Dec 2013 17:22:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 785A420710 for ; Fri, 13 Dec 2013 17:22:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DA48FA5C1; Fri, 13 Dec 2013 09:22:50 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qe0-f42.google.com (mail-qe0-f42.google.com [209.85.128.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 13269FA606 for ; Fri, 13 Dec 2013 09:22:47 -0800 (PST) Received: by mail-qe0-f42.google.com with SMTP id b4so1860338qen.15 for ; Fri, 13 Dec 2013 09:22:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3PaLvI75S7g5bx23qYOjHBkWTeNR3MLm+gSk3SKQMyw=; b=JCVeJIhvw1zeuHwSUROnu0bvEekugpm5dw3UL9NZi6+TOuR+NdKpC6PiTKFVVWUpsC VFPPm17GqvE1AIbL8673a/eZJdf9oWojhl/Aa888TrKh3DpBdtjEThWI5SDvAiuHS4Kr RQMNn3ZujSwJXhei7omlakDg/IS+GjatU4yE872nIvdVFoio+0rGKC2tqyEvkxXK7osV 3zQJLnhMfhUCbVQTkbYACnHkogcdTsg61GkiqE8Jc3NAd/UsDvHJjzHln1fGQsAdeKDE qlv5QlpZVDF4ZRzkFl1MG3tmAtxsePw9BIc803ljOjBi+zZaIzrEpEg+GoB3v13AXngd 1VuQ== X-Received: by 10.224.124.134 with SMTP id u6mr6336851qar.79.1386955366414; Fri, 13 Dec 2013 09:22:46 -0800 (PST) Received: from localhost.localdomain ([177.132.189.145]) by mx.google.com with ESMTPSA id c2sm9334730qan.4.2013.12.13.09.22.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 09:22:45 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 13 Dec 2013 15:22:30 -0200 Message-Id: <1386955352-2262-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.3.1 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 1/3] drm/i915: cancel the hangcheck before runtime suspend 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Paulo Zanoni The hangcheck function requires the hardware to be working, and if we're suspending we're going to put the HW in D3 state. Signed-off-by: Paulo Zanoni Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/i915_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index e7a6c84..70590b0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -920,6 +920,7 @@ static int i915_runtime_suspend(struct device *device) DRM_DEBUG_KMS("Suspending device\n"); + del_timer_sync(&dev_priv->gpu_error.hangcheck_timer); dev_priv->pm.suspended = true; intel_opregion_notify_adapter(dev, PCI_D3cold);