From patchwork Mon Oct 4 02:36:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 227791 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o942arIj019359 for ; Mon, 4 Oct 2010 02:37:14 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C2CF99E734 for ; Sun, 3 Oct 2010 19:36:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id A0D739E734; Sun, 3 Oct 2010 19:36:31 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 591F2760102; Sun, 3 Oct 2010 19:36:31 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id kMUuP7NFbfN4; Sun, 3 Oct 2010 19:36:27 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id 80DAF7600FF; Sun, 3 Oct 2010 19:36:27 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 7D21D7600C2; Sun, 3 Oct 2010 19:36:27 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id 26372120680; Sun, 3 Oct 2010 19:36:27 -0700 (PDT) From: Keith Packard To: intel-gfx@lists.freedesktop.org Date: Sun, 3 Oct 2010 19:36:26 -0700 Message-Id: <1286159786-3878-1-git-send-email-keithp@keithp.com> X-Mailer: git-send-email 1.7.1 Cc: dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH] drm/i915: avoid struct mutex output_poll mutex lock loop on unload X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 02:37:14 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9792285..a4cc072 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6052,9 +6052,9 @@ void intel_modeset_cleanup(struct drm_device *dev) struct drm_crtc *crtc; struct intel_crtc *intel_crtc; + drm_kms_helper_poll_fini(dev); mutex_lock(&dev->struct_mutex); - drm_kms_helper_poll_fini(dev); intel_fbdev_fini(dev); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {