From owner-svn-src-all@FreeBSD.ORG  Thu Jun 25 16:17:08 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB7A71065673;
	Thu, 25 Jun 2009 16:17:08 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1109F8FC28;
	Thu, 25 Jun 2009 16:17:07 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5PGH7QD056564;
	Thu, 25 Jun 2009 16:17:07 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5PGH7R2056561;
	Thu, 25 Jun 2009 16:17:07 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906251617.n5PGH7R2056561@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Thu, 25 Jun 2009 16:17:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194969 - head/sys/dev/drm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2009 16:17:09 -0000

Author: rnoland
Date: Thu Jun 25 16:17:07 2009
New Revision: 194969
URL: http://svn.freebsd.org/changeset/base/194969

Log:
  Initialize max_vblank_count earlier.
  
  Small cleanup of the error paths while I'm here.
  
  MFC after:	3 days

Modified:
  head/sys/dev/drm/radeon_cp.c
  head/sys/dev/drm/radeon_irq.c

Modified: head/sys/dev/drm/radeon_cp.c
==============================================================================
--- head/sys/dev/drm/radeon_cp.c	Thu Jun 25 16:15:39 2009	(r194968)
+++ head/sys/dev/drm/radeon_cp.c	Thu Jun 25 16:17:07 2009	(r194969)
@@ -2064,16 +2064,22 @@ int radeon_driver_load(struct drm_device
 			 drm_get_resource_len(dev, 2), _DRM_REGISTERS,
 			 _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
 	if (ret != 0)
-		return ret;
+		goto error;
 
 	ret = drm_vblank_init(dev, 2);
-	if (ret) {
-		radeon_driver_unload(dev);
-		return ret;
-	}
+	if (ret != 0)
+		goto error;
+
+	dev->max_vblank_count = 0x001fffff;
 
 	DRM_DEBUG("%s card detected\n",
-		  ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
+		  ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" :
+		    (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
+
+	return ret;
+
+error:
+	radeon_driver_unload(dev);
 	return ret;
 }
 

Modified: head/sys/dev/drm/radeon_irq.c
==============================================================================
--- head/sys/dev/drm/radeon_irq.c	Thu Jun 25 16:15:39 2009	(r194968)
+++ head/sys/dev/drm/radeon_irq.c	Thu Jun 25 16:17:07 2009	(r194969)
@@ -380,8 +380,6 @@ int radeon_driver_irq_postinstall(struct
 	atomic_set(&dev_priv->swi_emitted, 0);
 	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
 
-	dev->max_vblank_count = 0x001fffff;
-
 	radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
 
 	return 0;