From patchwork Wed Nov 11 17:19:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristian Hogsberg X-Patchwork-Id: 59376 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nABHK6qF001238 for ; Wed, 11 Nov 2009 17:20:06 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFCD39E9D5; Wed, 11 Nov 2009 09:20:05 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.221.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 27F679E9D3 for ; Wed, 11 Nov 2009 09:20:03 -0800 (PST) Received: by qyk10 with SMTP id 10so564978qyk.12 for ; Wed, 11 Nov 2009 09:20:03 -0800 (PST) Received: by 10.213.100.138 with SMTP id y10mr1746619ebn.96.1257960002533; Wed, 11 Nov 2009 09:20:02 -0800 (PST) Received: from localhost ([158.43.2.102]) by mx.google.com with ESMTPS id 7sm812649eyg.33.2009.11.11.09.20.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Nov 2009 09:20:01 -0800 (PST) From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= To: eric@anholt.net, intel-gfx@lists.freedesktop.org Date: Wed, 11 Nov 2009 12:19:17 -0500 Message-Id: <1257959958-3013-2-git-send-email-krh@bitplanet.net> X-Mailer: git-send-email 1.6.5.rc2 In-Reply-To: <1257959958-3013-1-git-send-email-krh@bitplanet.net> References: <1257959958-3013-1-git-send-email-krh@bitplanet.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Hold struct_mutex while unreffing pwrctx object X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 33113c7..c25a8e2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4550,8 +4550,6 @@ void intel_modeset_cleanup(struct drm_device *dev) intel_increase_renderclock(dev, false); del_timer_sync(&dev_priv->idle_timer); - mutex_unlock(&dev->struct_mutex); - if (dev_priv->display.disable_fbc) dev_priv->display.disable_fbc(dev); @@ -4560,6 +4558,8 @@ void intel_modeset_cleanup(struct drm_device *dev) drm_gem_object_unreference(dev_priv->pwrctx); } + mutex_unlock(&dev->struct_mutex); + drm_mode_config_cleanup(dev); }