From patchwork Thu Oct 10 08:54:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 3014981 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9DC49BF924 for ; Thu, 10 Oct 2013 08:55:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9360E20379 for ; Thu, 10 Oct 2013 08:55:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 464E220377 for ; Thu, 10 Oct 2013 08:55:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3968DE63FE for ; Thu, 10 Oct 2013 01:55:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (server109-228-6-235.live-servers.net [109.228.6.235]) by gabe.freedesktop.org (Postfix) with ESMTP id 367C6E637B for ; Thu, 10 Oct 2013 01:54:45 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.73.22; Received: from nuc-i3427.intel.com (unverified [78.156.73.22]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 130165137-1500050 for multiple; Thu, 10 Oct 2013 09:54:38 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Oct 2013 09:54:36 +0100 Message-Id: <1381395276-14055-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.7.9.5 X-Originating-IP: 78.156.73.22 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: Cancel outstanding pc8 work when shutting down the device 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 As part of the device quiesceing we need to disable all active timers and delayed workers so that they do not execute after the module is unloaded. Signed-off-by: Chris Wilson Cc: Paulo Zanoni Cc: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 683b68e..5ce1558 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11065,6 +11065,7 @@ void intel_modeset_quiesce(struct drm_device *dev) cancel_work_sync(&dev_priv->hotplug_work); cancel_work_sync(&dev_priv->rps.work); + cancel_delayed_work_sync(&dev_priv->pc8.enable_work); /* catch all required for dev_priv->wq */ flush_scheduled_work();