From patchwork Fri Dec 18 01:33:34 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Kristian Hogsberg <krh@bitplanet.net>
X-Patchwork-Id: 67769
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI4dSLC030811
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri, 18 Dec 2009 04:39:28 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 3F2E69E8F2;
	Thu, 17 Dec 2009 17:34:18 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from qw-out-1920.google.com (qw-out-1920.google.com
	[74.125.92.150])
	by gabe.freedesktop.org (Postfix) with ESMTP id 668C29E755
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 17 Dec 2009 17:34:15 -0800 (PST)
Received: by qw-out-1920.google.com with SMTP id 4so491160qwk.12
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 17 Dec 2009 17:34:14 -0800 (PST)
Received: by 10.224.72.163 with SMTP id m35mr2034431qaj.179.1261100054218;
	Thu, 17 Dec 2009 17:34:14 -0800 (PST)
Received: from localhost (c-67-186-134-90.hsd1.ma.comcast.net
	[67.186.134.90])
	by mx.google.com with ESMTPS id 5sm6755812qwg.28.2009.12.17.17.34.11
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Thu, 17 Dec 2009 17:34:12 -0800 (PST)
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
To: eric@anholt.net, intel-gfx@lists.freedesktop.org
Date: Thu, 17 Dec 2009 20:33:34 -0500
Message-Id: <1261100014-1201-1-git-send-email-krh@bitplanet.net>
X-Mailer: git-send-email 1.6.5.rc2
MIME-Version: 1.0
Subject: [Intel-gfx] [PATCH] drm/i915: Clean up vblank data after lastclose
	and unload
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org


diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index ad73e14..3735478 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -515,8 +515,6 @@ void drm_put_dev(struct drm_device *dev)
 	}
 	driver = dev->driver;
 
-	drm_vblank_cleanup(dev);
-
 	drm_lastclose(dev);
 
 	if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
@@ -531,6 +529,8 @@ void drm_put_dev(struct drm_device *dev)
 	if (dev->driver->unload)
 		dev->driver->unload(dev);
 
+	drm_vblank_cleanup(dev);
+
 	if (drm_core_has_AGP(dev) && dev->agp) {
 		kfree(dev->agp);
 		dev->agp = NULL;